[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 24 Jul 2012 05:48:08 +0000 (11:18 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 24 Jul 2012 05:48:08 +0000 (11:18 +0530)
bzr revid: mdi@tinyerp.com-20120724054808-rrsu3s9j5smrsuj8


Trivial merge