[MERGE]: Merge with lp:openobject-addons-trunk
authorksa (Open ERP) <ksa@tinyerp.co.in>
Wed, 18 Aug 2010 04:50:20 +0000 (10:20 +0530)
committerksa (Open ERP) <ksa@tinyerp.co.in>
Wed, 18 Aug 2010 04:50:20 +0000 (10:20 +0530)
bzr revid: ksa@tinyerp.co.in-20100818045020-5syvioz4guncqje6


Trivial merge