[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)
commit3c3b63918b733bc483abf4e5e21f050fd6d57cd3
tree5b215db13567cba509e06cf7b620064b35b7f662
parenta465c7445bf1dfe993fa4a4ebcf0f5c8d96a1443
parentb6b93ef9d0eee59855f509c844bcc1a18e7bbb8d
[MERGE] Merged from lp:~openerp/openobject-addons/trunk/

bzr revid: hmo@tinyerp.com-20100317054331-2ugxjaeuepfege4p