[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 31 Jul 2012 04:13:04 +0000 (09:43 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 31 Jul 2012 04:13:04 +0000 (09:43 +0530)
bzr revid: mdi@tinyerp.com-20120731041304-quu0ps8y16f5ux2l


Trivial merge