[MERGE] team1's work of sprint 21-22
authorQuentin De Paoli <qdp@cyan>
Thu, 10 Jun 2010 14:11:30 +0000 (16:11 +0200)
committerQuentin De Paoli <qdp@cyan>
Thu, 10 Jun 2010 14:11:30 +0000 (16:11 +0200)
bzr revid: qdp@cyan-20100610141130-h3dn7r9t40i9qod3


Trivial merge