[MERGE] Merged with main branch
authorpso (OpenERP) <pso@tinyerp.com>
Mon, 20 Aug 2012 11:34:18 +0000 (17:04 +0530)
committerpso (OpenERP) <pso@tinyerp.com>
Mon, 20 Aug 2012 11:34:18 +0000 (17:04 +0530)
bzr revid: pso@tinyerp.com-20120820113418-60k501hs6y0lpaxz


Trivial merge