[MERGE] trunk
authorvda (OpenERP) <vda@tinyerp.com>
Wed, 1 Jun 2011 05:21:29 +0000 (10:51 +0530)
committervda (OpenERP) <vda@tinyerp.com>
Wed, 1 Jun 2011 05:21:29 +0000 (10:51 +0530)
bzr revid: vda@tinyerp.com-20110601052129-twi7s7htcnwy1uvw


Trivial merge