[Merge]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Thu, 26 Aug 2010 05:04:02 +0000 (10:34 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Thu, 26 Aug 2010 05:04:02 +0000 (10:34 +0530)
commitb6a641294838a7ccffac4a995d9dd88f7d6ac72a
tree5d90fbf065c629b784a64151bfe3172217d2909a
parent7cf9abc8cf02e537591c4bfcb2727e34ef67d4f3
parentecc8b8bc2cf0375a82f694fa1e949dc65762bdf3
[Merge]: Merge with lp:openobject-addons

bzr revid: rpa@tinyerp.com-20100826050402-283hoq9e759fd2ox