[MERGE]
authorChristophe Simonis <christophe@tinyerp.com>
Thu, 9 Apr 2009 15:12:52 +0000 (17:12 +0200)
committerChristophe Simonis <christophe@tinyerp.com>
Thu, 9 Apr 2009 15:12:52 +0000 (17:12 +0200)
bzr revid: christophe@tinyerp.com-20090409151252-t6jwdad1201q97jq


Trivial merge