[MERGE]
authorChristophe Simonis <christophe@tinyerp.com>
Fri, 12 Dec 2008 11:51:47 +0000 (12:51 +0100)
committerChristophe Simonis <christophe@tinyerp.com>
Fri, 12 Dec 2008 11:51:47 +0000 (12:51 +0100)
bzr revid: christophe@tinyerp.com-20081212115147-r60x68okmkyon8tm


Trivial merge