[MERGE]
authorChristophe Chauvet <christophe.chauvet@syleam.fr>
Mon, 16 Mar 2009 18:08:25 +0000 (19:08 +0100)
committerChristophe Chauvet <christophe.chauvet@syleam.fr>
Mon, 16 Mar 2009 18:08:25 +0000 (19:08 +0100)
bzr revid: christophe.chauvet@syleam.fr-20090316180825-82lg5k4mo3iu3rry


Trivial merge