[MERGE]
authorOlivier Laurent <olt@tinyerp.com>
Mon, 19 Jan 2009 16:15:16 +0000 (17:15 +0100)
committerOlivier Laurent <olt@tinyerp.com>
Mon, 19 Jan 2009 16:15:16 +0000 (17:15 +0100)
bzr revid: olt@tinyerp.com-20090119161516-i5pe8g2saximqqe9


Trivial merge