merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 7 Jan 2009 07:02:57 +0000 (08:02 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 7 Jan 2009 07:02:57 +0000 (08:02 +0100)
bzr revid: fp@tinyerp.com-20090107070257-amrdnnzkkvs3tlz4


Trivial merge