bzr revid: stw-d9a6d631f7cfdab5a120a6b0104ce2dbf8644841
bzr revid: ced-05ecaf4832cc643975f5ed7fda4f1c5baab4b2ea