merge
authorChristophe Simonis <christophe@tinyerp.com>
Wed, 3 Sep 2008 09:48:11 +0000 (11:48 +0200)
committerChristophe Simonis <christophe@tinyerp.com>
Wed, 3 Sep 2008 09:48:11 +0000 (11:48 +0200)
bzr revid: christophe@tinyerp.com-20080903094811-r4ip70uyybbhynib


Trivial merge