[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Mon, 23 Jul 2012 04:43:57 +0000 (10:13 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Mon, 23 Jul 2012 04:43:57 +0000 (10:13 +0530)
bzr revid: mdi@tinyerp.com-20120723044357-us4yw11mibx4uppy


Trivial merge