[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 27 Sep 2012 04:14:23 +0000 (09:44 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 27 Sep 2012 04:14:23 +0000 (09:44 +0530)
bzr revid: mdi@tinyerp.com-20120927041423-4r2u9quuklma5yi1


Trivial merge