[MERGE]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Tue, 15 Jun 2010 05:09:37 +0000 (10:39 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Tue, 15 Jun 2010 05:09:37 +0000 (10:39 +0530)
commitd0da755878a37f37eb1fda57596ae515bb6493f3
treeacc9d5e5215f30508db026242f4138a5955642c7
parent9ca086f69c2487dd01095e8f30827c46809e8546
parent32c6c7993d207a06ad90917d6327e87048c39cfd
[MERGE]: Merge with lp:openobject-addons

bzr revid: rpa@tinyerp.com-20100615050937-5ze7zpr65makudux