Rev 1730: merge from bzr.dev in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1730
revision-id: pqm at pqm.ubuntu.com-20060609011657-d676366b38b5689b
parent: pqm at pqm.ubuntu.com-20060608200135-842f7645e1e456b6
parent: aaron.bentley at utoronto.ca-20060608232606-ae51cb0e2c685728
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-06-09 02:16:57 +0100
message:
  merge from bzr.dev
removed:
  bzrlib/util/configobj/validate.py validate.py-20051018184548-e700c5f98afa9389
added:
  bzrlib/benchmarks/bench_rocks.py bench_rocks.py-20060608120339-3ydxl3v2cori44zb-1
modified:
  bzrlib/benchmarks/__init__.py  __init__.py-20060516064526-eb0d37c78e86065d
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060608232606-ae51cb0e2c685728
    parent: aaron.bentley at utoronto.ca-20060608152109-6b05db298e9b6704
    parent: pqm at pqm.ubuntu.com-20060608200135-842f7645e1e456b6
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: configobj
    timestamp: Fri 2006-06-09 00:26:06 +0100
    message:
      merge from bzr.dev
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060608152109-6b05db298e9b6704
    parent: aaron.bentley at utoronto.ca-20060608150412-23c66c9112bb055f
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: configobj
    timestamp: Thu 2006-06-08 16:21:09 +0100
    message:
      Removed validate.py to stop configobj importing it uselessly
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060608150412-23c66c9112bb055f
    parent: aaron.bentley at utoronto.ca-20060608145953-74c0864048bf3df9
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: configobj
    timestamp: Thu 2006-06-08 16:04:12 +0100
    message:
      Benchmark the rocks command
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060608145953-74c0864048bf3df9
    parent: pqm at pqm.ubuntu.com-20060608063832-74b46cf8fdd4567a
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: configobj
    timestamp: Thu 2006-06-08 15:59:53 +0100
    message:
      Add run_bzr_external