[MERGE]
authorOlivier Laurent <olt@tinyerp.com>
Mon, 20 Jul 2009 09:34:13 +0000 (11:34 +0200)
committerOlivier Laurent <olt@tinyerp.com>
Mon, 20 Jul 2009 09:34:13 +0000 (11:34 +0200)
commitf468504a04a2b9c26fb90b3a6bb52a8c3abe90e1
tree14313fd093493cf60e82f23b9776ae30b86d7bc0
parentf977c2ed4ca7e19bbcb262044eecb1b0f88456fc
parent639c25ab32ae21200dfa1b42c8c380f356f89c47
[MERGE]

bzr revid: olt@tinyerp.com-20090720093413-ss8xfpg38q472l1i