moerge
authorFabien Pinckaers <fp@tinyerp.com>
Mon, 6 Apr 2009 15:56:20 +0000 (17:56 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Mon, 6 Apr 2009 15:56:20 +0000 (17:56 +0200)
bzr revid: fp@tinyerp.com-20090406155620-491lndaxgxry1w1c


Trivial merge