merge
authorFabien Pinckaers <fp@tinyerp.com>
Thu, 4 Sep 2008 16:20:11 +0000 (18:20 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Thu, 4 Sep 2008 16:20:11 +0000 (18:20 +0200)
bzr revid: fp@tinyerp.com-20080904162011-nack4jhdga7l0soc


Trivial merge