[MERGE]
authorOlivier Laurent <olt@tinyerp.com>
Tue, 9 Jun 2009 06:36:35 +0000 (08:36 +0200)
committerOlivier Laurent <olt@tinyerp.com>
Tue, 9 Jun 2009 06:36:35 +0000 (08:36 +0200)
bzr revid: olt@tinyerp.com-20090609063635-swetz0u3u0yi4s24


Trivial merge