[MERGE]: Merge with lp:~openerp-dev/openobject-addons/ron-dev-addons2
authorRucha (Open ERP) <rpa@tinyerp.com>
Tue, 8 Feb 2011 12:16:55 +0000 (17:46 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Tue, 8 Feb 2011 12:16:55 +0000 (17:46 +0530)
bzr revid: rpa@tinyerp.com-20110208121655-nthsxtqq9z3qd0w0


Trivial merge