[MREGE]: Merge with lp:~openerp-commiter/openobject-addons/dev-addons2-rha1
authorRucha (Open ERP) <rpa@tinyerp.com>
Tue, 15 Feb 2011 12:13:39 +0000 (17:43 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Tue, 15 Feb 2011 12:13:39 +0000 (17:43 +0530)
bzr revid: rpa@tinyerp.com-20110215121339-6m1hgunyf9edkvth


Trivial merge