New branch fix, we need setuptools 1.1 for now.