[MERGE]: Merge with lp:openobject-addons
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Tue, 30 Aug 2011 07:09:25 +0000 (12:39 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Tue, 30 Aug 2011 07:09:25 +0000 (12:39 +0530)
bzr revid: mma@tinyerp.com-20110830070925-e490gfpl06sev28z


Trivial merge