[MERGE] Merged with main branch
authorpso (OpenERP) <pso@tinyerp.com>
Thu, 30 Aug 2012 08:52:40 +0000 (14:22 +0530)
committerpso (OpenERP) <pso@tinyerp.com>
Thu, 30 Aug 2012 08:52:40 +0000 (14:22 +0530)
bzr revid: pso@tinyerp.com-20120830085240-xjou0bp03967xp7j


Trivial merge