[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Fri, 28 Sep 2012 04:15:12 +0000 (09:45 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Fri, 28 Sep 2012 04:15:12 +0000 (09:45 +0530)
bzr revid: mdi@tinyerp.com-20120927121802-qch0xhvx5kvhffvd
bzr revid: mdi@tinyerp.com-20120928041512-h86y5x1lxz4i1sm3


Trivial merge