merge c2c error fix
authorChristophe Simonis <christophe@tinyerp.com>
Fri, 12 Sep 2008 12:15:25 +0000 (14:15 +0200)
committerChristophe Simonis <christophe@tinyerp.com>
Fri, 12 Sep 2008 12:15:25 +0000 (14:15 +0200)
bzr revid: christophe@tinyerp.com-20080912121525-49409a8asgkluu2p


Trivial merge