Rev 4434: (jml) Merge in changes from trunk that belong in 1.16rc1. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4434
revision-id: pqm at pqm.ubuntu.com-20090611131015-2dzsxzsuwf4iqaq8
parent: pqm at pqm.ubuntu.com-20090611120023-8sfgsnttczc1e8s5
parent: jml at canonical.com-20090611121214-vo0izdkl30869y97
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-06-11 14:10:15 +0100
message:
  (jml) Merge in changes from trunk that belong in 1.16rc1.
    ------------------------------------------------------------
    revno: 4431.1.1
    revision-id: jml at canonical.com-20090611121214-vo0izdkl30869y97
    parent: pqm at pqm.ubuntu.com-20090611052211-b6b2pu471mdja7zz
    parent: pqm at pqm.ubuntu.com-20090611120023-8sfgsnttczc1e8s5
    committer: Jonathan Lange <jml at canonical.com>
    branch nick: prepare-1.16
    timestamp: Thu 2009-06-11 22:12:14 +1000
    message:
      Merge in changes from trunk that belong in 1.16
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/smart/bzrdir.py         bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
      bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
      bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
      bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
      bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
      bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
      bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2