merge
authorfp <fp@fp-laptop>
Sat, 17 Sep 2011 16:32:13 +0000 (18:32 +0200)
committerfp <fp@fp-laptop>
Sat, 17 Sep 2011 16:32:13 +0000 (18:32 +0200)
bzr revid: fp@fp-laptop-20110917163213-ejnjot1u1xazf03z


Trivial merge