[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 26 Sep 2012 04:14:43 +0000 (09:44 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 26 Sep 2012 04:14:43 +0000 (09:44 +0530)
bzr revid: mdi@tinyerp.com-20120926041443-ajw8j90afywh44f8


Trivial merge