[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Thu, 26 Jul 2012 09:54:42 +0000 (11:54 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Thu, 26 Jul 2012 09:54:42 +0000 (11:54 +0200)
commit3d47f6ec323f08837100bdf2c16c9e166c156ce8
treec39ccca888d1d9b28db620b892c761c5cd70e1c7
parente4d08977346c494628d6201e75088b0f4cad686b
parent5e93bcd9492fa0ae6d8746fb645e53b512e02aee
[MERGE] from trunk

bzr revid: fva@openerp.com-20120726095442-p61fnxm29l0piqg6
addons/product/product.py