[MERGE]
authorChristophe Simonis <christophe@tinyerp.com>
Fri, 28 Aug 2009 16:57:55 +0000 (18:57 +0200)
committerChristophe Simonis <christophe@tinyerp.com>
Fri, 28 Aug 2009 16:57:55 +0000 (18:57 +0200)
bzr revid: christophe@tinyerp.com-20090828163729-slp5iosj2h3ajodt
bzr revid: christophe@tinyerp.com-20090828165755-zht8z9xnk4ckonfi


Trivial merge