[MERGE]
authorqdp-launchpad@tinyerp.com <>
Fri, 18 Jun 2010 13:59:04 +0000 (15:59 +0200)
committerqdp-launchpad@tinyerp.com <>
Fri, 18 Jun 2010 13:59:04 +0000 (15:59 +0200)
bzr revid: qdp-launchpad@tinyerp.com-20100618135904-yaeuvylyoqytksyw


Trivial merge