Rev 1449: Merge from bzr.dev in /home/robertc/source/baz/integration/

[Robert Collins]

------------------------------------------------------------
revno: 1449
revision-id: robertc at robertcollins.net-20060124065059-1fcad84661b00b40
parent: robertc at robertcollins.net-20060121104713-1ccd09539b35a07b
parent: mbp at sourcefrog.net-20060123020939-567fb193328ed7a6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-01-24 17:50:59 +1100
message:
  Merge from bzr.dev
added:
  bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060123020939-567fb193328ed7a6
    parent: mbp at sourcefrog.net-20060119091139-d925dfcfdeef7109
    parent: robertc at robertcollins.net-20060121104713-1ccd09539b35a07b
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-01-23 13:09:39 +1100
    message:
      [merge] robert's integration
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060119091139-d925dfcfdeef7109
    parent: mbp at sourcefrog.net-20060118082354-b28f3ecdecc245b2
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Thu 2006-01-19 20:11:39 +1100
    message:
      Fix 'bzr added' typo, and tests for that command.  
      
      Patch from Nathan McCallum.