[MERGE] merged from lp:~openerp/openobject-addons/trunk/
authorHarry (Open ERP) <hmo@tinyerp.com>
Fri, 26 Mar 2010 10:37:16 +0000 (16:07 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Fri, 26 Mar 2010 10:37:16 +0000 (16:07 +0530)
commit003c39ebef1398afa35646a1a8ebd071f2495cc7
tree62fb5a4040a93a58d7c17b5c0736c9e8c374c36f
parent17968f108d4b7acb5bc8301023fc93f63f364047
parentb170ef94fccb34765bc4acec66e4659a24ce1753
[MERGE] merged from lp:~openerp/openobject-addons/trunk/

bzr revid: hmo@tinyerp.com-20100326103716-8dgskmgnp62l4vda
addons/product/product.py
addons/stock/stock.py