[MERGE]: Merge with lp:openobject-addons/trunk
authorRucha (Open ERP) <rpa@tinyerp.com>
Thu, 17 Feb 2011 07:17:07 +0000 (12:47 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Thu, 17 Feb 2011 07:17:07 +0000 (12:47 +0530)
bzr revid: rpa@tinyerp.com-20110217071707-pk6t28uyn013fa35


Trivial merge