[MERGE]
authorOlivier Laurent <olt@tinyerp.com>
Thu, 20 Aug 2009 12:17:11 +0000 (14:17 +0200)
committerOlivier Laurent <olt@tinyerp.com>
Thu, 20 Aug 2009 12:17:11 +0000 (14:17 +0200)
bzr revid: olt@tinyerp.com-20090820121711-1gs2lgwuc2p3uz9n


Trivial merge