[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 23 Oct 2012 04:37:06 +0000 (10:07 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 23 Oct 2012 04:37:06 +0000 (10:07 +0530)
bzr revid: mdi@tinyerp.com-20121023043706-sjfi8a92fpwk57kq


Trivial merge