[MERGE]: Merge with lp:openobject-trunk-dev-addons2
authoraag (OpenERP) <aag@tinyerp.co.in>
Thu, 25 Nov 2010 07:59:33 +0000 (13:29 +0530)
committeraag (OpenERP) <aag@tinyerp.co.in>
Thu, 25 Nov 2010 07:59:33 +0000 (13:29 +0530)
bzr revid: aag@tinyerp.co.in-20101125075933-5xs352trxr0eri3h

1  2 
addons/product/product.py
addons/product/product_view.xml

Simple merge
Simple merge