[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 9 Oct 2012 04:29:06 +0000 (09:59 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 9 Oct 2012 04:29:06 +0000 (09:59 +0530)
bzr revid: mdi@tinyerp.com-20121005044924-ssxgoggbs5sv5rth
bzr revid: mdi@tinyerp.com-20121008045355-m3a6d17e84k1rnx6
bzr revid: mdi@tinyerp.com-20121009042906-vij0k1x0hsfcx0pi


Trivial merge