[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Fri, 20 Jul 2012 04:09:40 +0000 (09:39 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Fri, 20 Jul 2012 04:09:40 +0000 (09:39 +0530)
bzr revid: mdi@tinyerp.com-20120718044007-42v3cb4gbg8u2ih8
bzr revid: mdi@tinyerp.com-20120719043853-djwgb256chgruhic
bzr revid: mdi@tinyerp.com-20120720040940-t5xnu21ef7rp2n0n


Trivial merge