[MERGE] Merged with main branch
authorpso (OpenERP) <pso@tinyerp.com>
Thu, 23 Aug 2012 09:08:41 +0000 (14:38 +0530)
committerpso (OpenERP) <pso@tinyerp.com>
Thu, 23 Aug 2012 09:08:41 +0000 (14:38 +0530)
bzr revid: pso@tinyerp.com-20120823090841-adebkbo3tfhn5bet


Trivial merge