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

[Robert Collins]

------------------------------------------------------------
revno: 1588
revision-id: robertc at robertcollins.net-20060316215951-15c76b4d8ea06ca5
parent: robertc at robertcollins.net-20060316205332-f4f08a6852e590f1
parent: pqm at pqm.ubuntu.com-20060315174853-9af1dfc721b7c963
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-03-17 08:59:51 +1100
message:
  Merge bzr.dev
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
  bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060315174853-9af1dfc721b7c963
    parent: pqm at pqm.ubuntu.com-20060313111548-a43e5df3eecad141
    parent: abentley at panoramicfeedback.com-20060315172753-31fb96afb635cec1
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-03-15 17:48:53 +0000
    message:
      Merged showing parent in info
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060315172753-31fb96afb635cec1
    parent: abentley at panoramicfeedback.com-20060314142816-2bcc49ace313648c
    parent: olaf at conradi.org-20060315135919-cf48fa226c66646e
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Wed 2006-03-15 12:27:53 -0500
    message:
      Merged showing parent in info
    ------------------------------------------------------------
    merged: olaf at conradi.org-20060315135919-cf48fa226c66646e
    parent: pqm at pqm.ubuntu.com-20060313111548-a43e5df3eecad141
    committer: Olaf Conradi <olaf at conradi.org>
    branch nick: bzr.olaf
    timestamp: Wed 2006-03-15 14:59:19 +0100
    message:
      Add parent location to info command (Closes feature bug #33364).
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060314142816-2bcc49ace313648c
    parent: abentley at panoramicfeedback.com-20060310205155-7dd585e1996519c5
    parent: pqm at pqm.ubuntu.com-20060313111548-a43e5df3eecad141
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Tue 2006-03-14 09:28:16 -0500
    message:
      Merge from mainline