[MERGE] merge with main addons
authorRajesh Prajapati (OpenERP) <rpr@tinyerp.com>
Fri, 21 Sep 2012 05:28:50 +0000 (10:58 +0530)
committerRajesh Prajapati (OpenERP) <rpr@tinyerp.com>
Fri, 21 Sep 2012 05:28:50 +0000 (10:58 +0530)
bzr revid: rpr@tinyerp.com-20120921052850-mkmb4crc5drsqnlw


Trivial merge