[MERGE]: Merge with latest trunk-addons
authorRucha (Open ERP) <rpa@tinyerp.com>
Thu, 12 Jul 2012 06:26:23 +0000 (11:56 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Thu, 12 Jul 2012 06:26:23 +0000 (11:56 +0530)
bzr revid: rpa@tinyerp.com-20120712062623-cvhg4a2ewwqp9hcv

1  2 
addons/product/product.py

Simple merge