[MERGE] lp:~stephane-openerp/openobject-server/trunk_setup_use_setuptools
authorStephane Wirtel <stephane@openerp.com>
Fri, 13 Aug 2010 13:03:10 +0000 (15:03 +0200)
committerStephane Wirtel <stephane@openerp.com>
Fri, 13 Aug 2010 13:03:10 +0000 (15:03 +0200)
commitf850f28ea68c016fa2c61977dbb14cc13e787f5d
treea308f0a3d6a041bfd4aca0e8d5980298bf70261b
parent47a40c7698b41fab1c6659ea5990417ad0932310
parent4169795ad229cb8a61d71c49354be897046a8bd1
[MERGE] lp:~stephane-openerp/openobject-server/trunk_setup_use_setuptools

bzr revid: stephane@openerp.com-20100813130310-2ttfgqbij0xgdkp6
setup.py