merge
authorChristophe Simonis <christophe@tinyerp.com>
Tue, 16 Sep 2008 12:28:54 +0000 (14:28 +0200)
committerChristophe Simonis <christophe@tinyerp.com>
Tue, 16 Sep 2008 12:28:54 +0000 (14:28 +0200)
bzr revid: christophe@tinyerp.com-20080916122854-tbd84vxici5evqg8


Trivial merge