[MERGE]: Merge with lp:openobject-addons
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Wed, 25 Jan 2012 11:49:11 +0000 (17:19 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Wed, 25 Jan 2012 11:49:11 +0000 (17:19 +0530)
bzr revid: mma@tinyerp.com-20120125114911-qqcm2v4uhgf2jcim


Trivial merge