[MERGE]
authorChristophe Simonis <christophe@tinyerp.com>
Thu, 12 Feb 2009 10:10:29 +0000 (11:10 +0100)
committerChristophe Simonis <christophe@tinyerp.com>
Thu, 12 Feb 2009 10:10:29 +0000 (11:10 +0100)
bzr revid: christophe@tinyerp.com-20090212101029-ip34113jecdly21m


Trivial merge