[MERGE]: Merge with lp:openobject-addons
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Thu, 15 Sep 2011 12:28:02 +0000 (17:58 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Thu, 15 Sep 2011 12:28:02 +0000 (17:58 +0530)
bzr revid: mma@tinyerp.com-20110915122802-hkryrz918we4ynzj


Trivial merge