[MERGE]
authorQuentin De Paoli <qdp@cyan>
Tue, 1 Jun 2010 13:16:50 +0000 (15:16 +0200)
committerQuentin De Paoli <qdp@cyan>
Tue, 1 Jun 2010 13:16:50 +0000 (15:16 +0200)
bzr revid: qdp@cyan-20100601131650-nfdp1wo7te4b6btn


Trivial merge