Rev 1473: Merge from bzr.dev. in /home/robertc/source/baz/inter-repo-api/

[Robert Collins]

------------------------------------------------------------
revno: 1473
revision-id: robertc at robertcollins.net-20060221014955-c8bdf2cae88c5e34
parent: robertc at robertcollins.net-20060221000809-e41f2f69a365093f
parent: robertc at robertcollins.net-20060221004343-ccf22f64d96aa17d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Tue 2006-02-21 12:49:55 +1100
message:
  Merge from bzr.dev.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060221004343-ccf22f64d96aa17d
    parent: pqm at pqm.ubuntu.com-20060220043919-b01f8960604b339d
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Tue 2006-02-21 11:43:43 +1100
    message:
      Move the SFTP URL change for relative and absolute paths to the right place in NEWS.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060220043919-b01f8960604b339d
    parent: pqm at pqm.ubuntu.com-20060219235508-029a9d591a35f189
    parent: robertc at robertcollins.net-20060220002935-c653f31ef30cadff
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-02-20 04:39:19 +0000
    message:
      Merge push/pull and branching within repositories bugfix.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060219235508-029a9d591a35f189
    parent: pqm at pqm.ubuntu.com-20060218023347-0952c65f668bfd68
    parent: robertc at robertcollins.net-20060219234731-4f361d82e113cbb0
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2006-02-19 23:55:08 +0000
    message:
      Remove unused patches/ directory.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060218023347-0952c65f668bfd68
    parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
    parent: robertc at robertcollins.net-20060218005717-348c76bf711254a5
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2006-02-18 02:33:47 +0000
    message:
      Merge Robert Collins integration.