[MERGE] merge with latest stable
authorXavier ALT <xal@openerp.com>
Mon, 26 Mar 2012 14:43:08 +0000 (16:43 +0200)
committerXavier ALT <xal@openerp.com>
Mon, 26 Mar 2012 14:43:08 +0000 (16:43 +0200)
commita73b932d4a82142529356420af093b91a7353cb5
tree2ab6312e9a3b26110a273b3603a5498e12b44f74
parentb3735436ee5f8c1e610ba439fe0ba7f6f4d2dfe6
parent79db45b491664bc6c624fd12f3c2ae7b2fbe1eb6
[MERGE] merge with latest stable

bzr revid: xal@openerp.com-20120326144308-x0hqdhlbrqvrecu4
addons/stock/stock.py