merge
authorFabien Pinckaers <fp@tinyerp.com>
Fri, 11 Nov 2011 13:51:23 +0000 (14:51 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Fri, 11 Nov 2011 13:51:23 +0000 (14:51 +0100)
bzr revid: fp@tinyerp.com-20111111135123-dl84n5sfqjv2zsb9

1  2 
addons/stock/product.py

Simple merge