[MERGE]: Merged with addons
authorAtul Patel (OpenERP) <atp@tinyerp.com>
Fri, 14 Jun 2013 13:52:06 +0000 (19:22 +0530)
committerAtul Patel (OpenERP) <atp@tinyerp.com>
Fri, 14 Jun 2013 13:52:06 +0000 (19:22 +0530)
bzr revid: atp@tinyerp.com-20130614135206-u0kxrrzioiyr9jvh


Trivial merge