merge
authorFabien Pinckaers <fp@tinyerp.com>
Tue, 2 Dec 2008 16:24:29 +0000 (17:24 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Tue, 2 Dec 2008 16:24:29 +0000 (17:24 +0100)
bzr revid: fp@tinyerp.com-20081202162429-pg8su0maov4ak4vu


Trivial merge