[MERGE]
authorOlivier Laurent <olt@tinyerp.com>
Tue, 3 Feb 2009 14:53:08 +0000 (15:53 +0100)
committerOlivier Laurent <olt@tinyerp.com>
Tue, 3 Feb 2009 14:53:08 +0000 (15:53 +0100)
bzr revid: olt@tinyerp.com-20090203145308-j25zdhhz0g1xng73


Trivial merge