merge
authorChristophe Simonis <christophe@tinyerp.com>
Tue, 5 Aug 2008 11:03:06 +0000 (13:03 +0200)
committerChristophe Simonis <christophe@tinyerp.com>
Tue, 5 Aug 2008 11:03:06 +0000 (13:03 +0200)
bzr revid: christophe@tinyerp.com-20080805110306-0urcjaz3sxd12kn1


Trivial merge