merge
authorChristophe Simonis <christophe@tinyerp.com>
Wed, 3 Sep 2008 11:23:23 +0000 (13:23 +0200)
committerChristophe Simonis <christophe@tinyerp.com>
Wed, 3 Sep 2008 11:23:23 +0000 (13:23 +0200)
bzr revid: christophe@tinyerp.com-20080903112323-zsdt7p503bczpps8


Trivial merge