merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 17 Sep 2008 09:10:29 +0000 (11:10 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 17 Sep 2008 09:10:29 +0000 (11:10 +0200)
bzr revid: fp@tinyerp.com-20080917091029-q5tsneb0a6dyt42v


Trivial merge