[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-v62_config_product-uco
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Tue, 13 Mar 2012 10:30:15 +0000 (16:00 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Tue, 13 Mar 2012 10:30:15 +0000 (16:00 +0530)
commit5be3d4c4e997962baffa10cbb62e18ae2ce57b8a
tree11df68c182d853ab3a8761429b9d94dfe575d20c
parente9e789cd1fa818c7dc7c40ad948cd6296814548d
parent65d466b4fea6b19504b932fdf53e53ce8ae3fc5f
[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-v62_config_product-uco

bzr revid: tpa@tinyerp.com-20120313103015-p37q8zu28xlujnd1
addons/product/__init__.py
addons/product/product_view.xml
addons/product/security/product_security.xml