merge
authorfp <fp@fp-laptop>
Sat, 17 Sep 2011 17:39:59 +0000 (19:39 +0200)
committerfp <fp@fp-laptop>
Sat, 17 Sep 2011 17:39:59 +0000 (19:39 +0200)
bzr revid: fp@fp-laptop-20110917173959-nrf248w30ryfubvo


Trivial merge