[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 10 Jul 2012 04:22:42 +0000 (09:52 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 10 Jul 2012 04:22:42 +0000 (09:52 +0530)
bzr revid: mdi@tinyerp.com-20120710042242-zxe09fo9k154knad


Trivial merge