[MERGE] Merged from lp:~openerp/openobject-addons/trunk/
authorHarry (Open ERP) <hmo@tinyerp.com>
Wed, 17 Mar 2010 05:43:31 +0000 (11:13 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Wed, 17 Mar 2010 05:43:31 +0000 (11:13 +0530)
bzr revid: hmo@tinyerp.com-20100317054331-2ugxjaeuepfege4p


Trivial merge