[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 5 Jul 2012 04:32:44 +0000 (10:02 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 5 Jul 2012 04:32:44 +0000 (10:02 +0530)
bzr revid: mdi@tinyerp.com-20120705043244-rkvmlh3q2ho4eqrb


Trivial merge