Rev 1503: merge repository. in /home/robertc/source/baz/bzr-dir/

[Robert Collins]

------------------------------------------------------------
revno: 1503
revision-id: robertc at robertcollins.net-20060216004439-5110484bd7b39a88
parent: robertc at robertcollins.net-20060215081137-4c27377517e96dd1
parent: robertc at robertcollins.net-20060215221605-09ef2fed453334c6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 11:44:39 +1100
message:
  merge repository.
modified:
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060215221605-09ef2fed453334c6
    parent: robertc at robertcollins.net-20060215203303-b089365be1ea915e
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: repository
    timestamp: Thu 2006-02-16 09:16:05 +1100
    message:
      Typo found by John Meinel.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060215203303-b089365be1ea915e
    parent: robertc at robertcollins.net-20060215035815-93475eacfb0b41d2
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: repository
    timestamp: Thu 2006-02-16 07:33:03 +1100
    message:
      Review feedback.