[MERGE] lp:~stephane-openerp/openobject-server/trunk_setup_use_setuptools
[MERGE] lp:~stephane-openerp/openobject-server/trunk_setup_use_setuptools

akretion/openerp-server,akretion/openerp-server,akretion/openerp-server