[MERGE] Merging
authorpso (OpenERP) <pso@tinyerp.com>
Tue, 2 Aug 2011 12:43:33 +0000 (18:13 +0530)
committerpso (OpenERP) <pso@tinyerp.com>
Tue, 2 Aug 2011 12:43:33 +0000 (18:13 +0530)
bzr revid: pso@tinyerp.com-20110802124333-qln5fgqjl0j0j9ww


Trivial merge