[MERGE]: Merge with lp:openobject-addons-trunk
authorksa (Open ERP) <ksa@tinyerp.co.in>
Fri, 15 Oct 2010 05:02:53 +0000 (10:32 +0530)
committerksa (Open ERP) <ksa@tinyerp.co.in>
Fri, 15 Oct 2010 05:02:53 +0000 (10:32 +0530)
bzr revid: ksa@tinyerp.co.in-20101015050253-3ukg6vruzel01uxk


Trivial merge