Rev 116: Merge Now. in http://people.canonical.com/~robertc/baz2.0/plugins/loom/testtrunk

[Robert Collins]

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

------------------------------------------------------------
revno: 116 [merge]
revision-id: robertc at robertcollins.net-20100618051452-zlhsg1by8amqg2g1
parent: robertc at robertcollins.net-20100618044452-2hnpj2opedjt8iy9
parent: robertc at robertcollins.net-20100618051419-qeipwlosu4ywwpus
committer: Robert Collins <robertc at robertcollins.net>
branch nick: testtrunk
timestamp: Fri 2010-06-18 17:14:52 +1200
message:
  Merge Now.