Rev 1994: Merge bzr.dev. in file:///home/robertc/source/baz/test-performance/

[Robert Collins]

------------------------------------------------------------
revno: 1994
revision-id: robertc at robertcollins.net-20060918044531-ee0dbf8d92cfd0c3
parent: robertc at robertcollins.net-20060914035209-152ab9b4b2941339
parent: robertc at robertcollins.net-20060914061829-50c4cd1fdef9e848
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Mon 2006-09-18 14:45:31 +1000
message:
  Merge bzr.dev.
modified:
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060914061829-50c4cd1fdef9e848
    parent: robertc at robertcollins.net-20060914032717-1706ea260c3c77c9
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: make_branch_and_checkout
    timestamp: Thu 2006-09-14 16:18:29 +1000
    message:
      Bugfix - the name of the test for make_branch_and_memory_tree was wrong.