[MERGE]: Merge with lp:openobject-addons
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Thu, 15 Sep 2011 12:40:27 +0000 (18:10 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Thu, 15 Sep 2011 12:40:27 +0000 (18:10 +0530)
bzr revid: mma@tinyerp.com-20110915124027-1dhp83ui5yvku12q


Trivial merge