[MERGE]
authornel@tinyerp.com <>
Tue, 15 Jun 2010 08:47:18 +0000 (10:47 +0200)
committernel@tinyerp.com <>
Tue, 15 Jun 2010 08:47:18 +0000 (10:47 +0200)
commitd1c455363ebbc665d62034b8e8b645fb94d16d71
tree3f3e7498c2e7e83e915788804451777741a132b3
parentdd20f9ff47ad8e373ffadf608f15a323bcbe6e55
parent10079e63a2e7698e8f74883ef46c45cf14d12fd2
[MERGE]

bzr revid: nel@tinyerp.com-20100615084718-jtmo6qh8l5emrnde
addons/stock/stock.py