merge
authorChristophe Simonis <christophe@tinyerp.com>
Fri, 28 Nov 2008 09:12:45 +0000 (10:12 +0100)
committerChristophe Simonis <christophe@tinyerp.com>
Fri, 28 Nov 2008 09:12:45 +0000 (10:12 +0100)
bzr revid: christophe@tinyerp.com-20081128091245-stzqh3889jdz2qrz


Trivial merge