[MERGE]
authorChristophe Simonis <christophe@tinyerp.com>
Wed, 12 Aug 2009 09:31:04 +0000 (11:31 +0200)
committerChristophe Simonis <christophe@tinyerp.com>
Wed, 12 Aug 2009 09:31:04 +0000 (11:31 +0200)
bzr revid: christophe@tinyerp.com-20090811141115-d5sy0wcp5tea6o53
bzr revid: christophe@tinyerp.com-20090812081203-lhman18vsrmhyepg
bzr revid: christophe@tinyerp.com-20090812093104-52gl73glxx90ix39


Trivial merge