[MERGE]
authorOlivier Laurent <olt@tinyerp.com>
Tue, 7 Jul 2009 07:14:13 +0000 (09:14 +0200)
committerOlivier Laurent <olt@tinyerp.com>
Tue, 7 Jul 2009 07:14:13 +0000 (09:14 +0200)
bzr revid: olt@tinyerp.com-20090707071413-6hp0dcgsh1tqbdnc


Trivial merge