[MERGE]Merged:-lp:trunk-dev-addons2
authorron@tinyerp.com <>
Mon, 22 Nov 2010 07:15:51 +0000 (12:45 +0530)
committerron@tinyerp.com <>
Mon, 22 Nov 2010 07:15:51 +0000 (12:45 +0530)
bzr revid: ron@tinyerp.com-20101122071551-g3dvnh7b4bw07wm3

1  2 
addons/delivery/delivery_view.xml
addons/product/product.py
addons/stock/stock_view.xml

Simple merge
Simple merge
Simple merge