merge
authorFabien Pinckaers <fp@tinyerp.com>
Tue, 22 Dec 2009 19:00:39 +0000 (20:00 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Tue, 22 Dec 2009 19:00:39 +0000 (20:00 +0100)
bzr revid: fp@tinyerp.com-20091222190039-sz4f5q5r02v6jptu

1  2 
addons/product/product.py

Simple merge