[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 11 Jul 2012 05:01:05 +0000 (10:31 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 11 Jul 2012 05:01:05 +0000 (10:31 +0530)
bzr revid: mdi@tinyerp.com-20120711050105-u25nvaztam6jac6d


Trivial merge