[Merge]: Merged with addons
authorAtul Patel (OpenERP) <atp@tinyerp.com>
Thu, 18 Jul 2013 04:20:25 +0000 (09:50 +0530)
committerAtul Patel (OpenERP) <atp@tinyerp.com>
Thu, 18 Jul 2013 04:20:25 +0000 (09:50 +0530)
bzr revid: atp@tinyerp.com-20130718042025-4jn0hldondi7pvjc


Trivial merge