Rev 117: Merge trunk into thread in http://people.canonical.com/~robertc/baz2.0/plugins/loom/testloom

[Robert Collins]

At http://people.canonical.com/~robertc/baz2.0/plugins/loom/testloom

------------------------------------------------------------
revno: 117 [merge]
revision-id: robertc at robertcollins.net-20100618051735-dzr27mi9gaeb67y4
parent: robertc at robertcollins.net-20100618051659-kv4voxpy2v89doeq
parent: robertc at robertcollins.net-20100618051710-1occ4d9qgzwsut39
committer: Robert Collins <robertc at robertcollins.net>
branch nick: thread
timestamp: Fri 2010-06-18 17:17:35 +1200
message:
  Merge trunk into thread