[MERGE] Merged ADO's branch to fix the TypeError: unsupported operand type(s) for...
authorpso (OpenERP) <pso@tinyerp.com>
Mon, 11 Jul 2011 10:02:37 +0000 (15:32 +0530)
committerpso (OpenERP) <pso@tinyerp.com>
Mon, 11 Jul 2011 10:02:37 +0000 (15:32 +0530)
bzr revid: pso@tinyerp.com-20110711100237-0xyqrx4djnke58ui


Trivial merge