[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 25 Sep 2012 04:04:38 +0000 (09:34 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 25 Sep 2012 04:04:38 +0000 (09:34 +0530)
bzr revid: mdi@tinyerp.com-20120925040438-ybuavteio9u2gx48


Trivial merge