[MERGE] merge with main addons
authorKuldeep Joshi (OpenERP) <kjo@tinyerp.com>
Tue, 12 Jun 2012 11:47:20 +0000 (17:17 +0530)
committerKuldeep Joshi (OpenERP) <kjo@tinyerp.com>
Tue, 12 Jun 2012 11:47:20 +0000 (17:17 +0530)
bzr revid: kjo@tinyerp.com-20120612114720-ehebwl8uw9w56azk


Trivial merge