[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 27 Sep 2012 04:16:00 +0000 (09:46 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 27 Sep 2012 04:16:00 +0000 (09:46 +0530)
bzr revid: mdi@tinyerp.com-20120927041600-nvsxljp352gp137g


Trivial merge