[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Mon, 23 Jul 2012 04:46:14 +0000 (10:16 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Mon, 23 Jul 2012 04:46:14 +0000 (10:16 +0530)
bzr revid: mdi@tinyerp.com-20120723044614-qmwvwi6n51j2bbtx


Trivial merge