[MERGE]: Merge with lp:~openerp-dev/openobject-addons/ron-dev-addons2
authorRucha (Open ERP) <rpa@tinyerp.com>
Tue, 15 Feb 2011 11:13:16 +0000 (16:43 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Tue, 15 Feb 2011 11:13:16 +0000 (16:43 +0530)
bzr revid: rpa@tinyerp.com-20110215111316-8s2em5kx321k2fy1


Trivial merge