[MERGE]Latest trunk
authordle@openerp.com <>
Mon, 17 Dec 2012 08:48:28 +0000 (09:48 +0100)
committerdle@openerp.com <>
Mon, 17 Dec 2012 08:48:28 +0000 (09:48 +0100)
bzr revid: dle@openerp.com-20121216155740-l5pf92r3nwubs2et
bzr revid: dle@openerp.com-20121217084828-a6yqkokxmb5gkyqr

1  2 
addons/stock/stock.py

Simple merge