[Merge]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Wed, 25 Aug 2010 05:38:52 +0000 (11:08 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Wed, 25 Aug 2010 05:38:52 +0000 (11:08 +0530)
commitb98887be40390ad89c60176f9cf4e2b5e81b26d0
tree329c0197d104f22669982a55921f87969a9e4815
parentc2414843ccb6cc8e9f2d52b9bb0c9185cf800ed3
parentbf204f7ee455198597acfcf74229f9b447d49957
[Merge]: Merge with lp:openobject-addons

bzr revid: rpa@tinyerp.com-20100825053852-vecfoba8ot3j6m7b