[MERGE] trunk.
authorvda (OpenERP) <vda@tinyerp.com>
Thu, 2 Jun 2011 05:08:10 +0000 (10:38 +0530)
committervda (OpenERP) <vda@tinyerp.com>
Thu, 2 Jun 2011 05:08:10 +0000 (10:38 +0530)
bzr revid: vda@tinyerp.com-20110602050810-ekg55hod3zryzbwi


Trivial merge