[MERGE]
authorOlivier Laurent <olt@tinyerp.com>
Fri, 3 Jul 2009 09:19:33 +0000 (11:19 +0200)
committerOlivier Laurent <olt@tinyerp.com>
Fri, 3 Jul 2009 09:19:33 +0000 (11:19 +0200)
commitd1aedc9d30d529913bb46067abe4eb07d9f7785e
treea49892e3fe5b32ad9dacfe359469375247228a62
parent12f70d2da992f80af51bdcab505f1d95ab81fd7e
parent689393f8b42fac258ba7aaf98000f0980f014ea5
[MERGE]

bzr revid: olt@tinyerp.com-20090703091933-orzp74newua6bsug