[merge]
authornvi-openerp <nicolas.vanhoren@openerp.com>
Wed, 8 Dec 2010 10:52:49 +0000 (11:52 +0100)
committernvi-openerp <nicolas.vanhoren@openerp.com>
Wed, 8 Dec 2010 10:52:49 +0000 (11:52 +0100)
commit38569b7754bb2e1dc1b6e8d58df626ff0fafaedb
treee0ad1d56381f8f0e4d288c0f50407191ab8ac7a7
parent8cc1c1086d2243678e2fef9c1631758ac517d097
parent00f2f6b97d71f43fe38c0ade7875864dd7ef564b
[merge]

bzr revid: nicolas.vanhoren@openerp.com-20101206091222-miwtrvjkfh8hy8ec
bzr revid: nicolas.vanhoren@openerp.com-20101206174010-f819dzx7vyw2jntk
bzr revid: nicolas.vanhoren@openerp.com-20101207132443-z0wabhbh0ruzwoo2
bzr revid: nicolas.vanhoren@openerp.com-20101208105249-qfjalxkboqpi9xr0
bin/addons/base/__openerp__.py
bin/netsvc.py