[MERGE]: Merge with lp:openobject-trunk-dev-addons2
authorksa (Open ERP) <ksa@tinyerp.co.in>
Mon, 10 May 2010 04:48:54 +0000 (10:18 +0530)
committerksa (Open ERP) <ksa@tinyerp.co.in>
Mon, 10 May 2010 04:48:54 +0000 (10:18 +0530)
commit1c0447cef4e8fc23d08ab1f3925382bf71a670a8
tree66bd0e4db358ca295a7cde23a9ddf98f191bc806
parentc8215836a4862f41cdb44f36dd48ed44ce641547
parent72d5f18fd833d0a2df6f84bce837236048542543
[MERGE]: Merge with lp:openobject-trunk-dev-addons2

bzr revid: ksa@tinyerp.co.in-20100510044854-syh4hm3cgdce5296