[Merge]with: lp:openobject-addons
authorDBR (OpenERP) <dbr@tinyerp.com>
Wed, 21 Sep 2011 10:44:55 +0000 (16:14 +0530)
committerDBR (OpenERP) <dbr@tinyerp.com>
Wed, 21 Sep 2011 10:44:55 +0000 (16:14 +0530)
bzr revid: dbr@tinyerp.com-20110921104455-yg1j8lu1yfoufeel


Trivial merge