[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 22 Aug 2012 04:47:18 +0000 (10:17 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 22 Aug 2012 04:47:18 +0000 (10:17 +0530)
bzr revid: mdi@tinyerp.com-20120820041322-lcph0efef1zj6n0u
bzr revid: mdi@tinyerp.com-20120821043948-9h8huqju00pc4qm6
bzr revid: mdi@tinyerp.com-20120822044718-3gpku8pqin0a4rek


Trivial merge