[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 16 Oct 2012 04:38:09 +0000 (10:08 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 16 Oct 2012 04:38:09 +0000 (10:08 +0530)
bzr revid: mdi@tinyerp.com-20121015053038-mt4rrh1rbmgr5bc0
bzr revid: mdi@tinyerp.com-20121016043809-l6gj04dq52wza0o3


Trivial merge