Rev 1687: Merge integration. in /home/robertc/source/baz/commit-progress/

[Robert Collins]

------------------------------------------------------------
revno: 1687
revision-id: robertc at robertcollins.net-20060512003145-621d33bc482c3ba8
parent: robertc at robertcollins.net-20060511071742-f26fd21daeb68152
parent: pqm at pqm.ubuntu.com-20060511175037-f66b84c6a9fc4c12
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit-progress
timestamp: Fri 2006-05-12 10:31:45 +1000
message:
  Merge integration.
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/help.py                 help.py-20050505025907-4dd7a6d63912f894
  bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
  bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060511175037-f66b84c6a9fc4c12
    parent: pqm at pqm.ubuntu.com-20060511100533-e3d066b362716fe2
    parent: robertc at robertcollins.net-20060511022331-d482c578c078f122
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-05-11 18:50:37 +0100
    message:
      Merge selftest uses progress-bars. (Robert Collins).
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060511100533-e3d066b362716fe2
    parent: pqm at pqm.ubuntu.com-20060508035625-57977d108d877af8
    parent: john at arbash-meinel.com-20060510174825-74dcaba644915bec
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-05-11 11:05:33 +0100
    message:
      (jam) update web page url to http://bazaar-vcs.org
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060510174825-74dcaba644915bec
    parent: john at arbash-meinel.com-20060506175419-fe86b1f2a9e88a53
    parent: pqm at pqm.ubuntu.com-20060508035625-57977d108d877af8
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Wed 2006-05-10 10:48:25 -0700
    message:
      [merge] bzr.dev 1704
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060506175419-fe86b1f2a9e88a53
    parent: john at arbash-meinel.com-20060429154015-2ed83b4e1041240e
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Sat 2006-05-06 12:54:19 -0500
    message:
      Updated web page url to http://bazaar-vcs.org