merge
authorOlivier Laurent <olt@tinyerp.com>
Tue, 14 Oct 2008 13:50:23 +0000 (15:50 +0200)
committerOlivier Laurent <olt@tinyerp.com>
Tue, 14 Oct 2008 13:50:23 +0000 (15:50 +0200)
bzr revid: olt@tinyerp.com-20081014135023-ko9f44sasm2fg4ig


Trivial merge