[MERGE] merge team 3's work of sprint 20-21
authorQuentin De Paoli <qdp@cyan>
Wed, 2 Jun 2010 10:47:02 +0000 (12:47 +0200)
committerQuentin De Paoli <qdp@cyan>
Wed, 2 Jun 2010 10:47:02 +0000 (12:47 +0200)
bzr revid: qdp@cyan-20100602104702-1c1cvizwzyc6b62j


Trivial merge