merge
authorOlivier Laurent <olt@tinyerp.com>
Thu, 9 Oct 2008 13:08:04 +0000 (15:08 +0200)
committerOlivier Laurent <olt@tinyerp.com>
Thu, 9 Oct 2008 13:08:04 +0000 (15:08 +0200)
bzr revid: olt@tinyerp.com-20081009130804-i4htthxn1w651nc0


Trivial merge