4 files changed, 46 insertions, 46 deletions

diff --git a/ez_setup.py b/ez_setup.py
index ba03f0a7..a781d1d2 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@ try:
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "2.1"
+DEFAULT_VERSION = "2.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 1a9b3849..6b10d6dc 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,3 +1,13 @@
+[egg_info.writers]
+requires.txt = setuptools.command.egg_info:write_requirements
+entry_points.txt = setuptools.command.egg_info:write_entries
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
 easy_install-3.4 = setuptools.command.easy_install:main
@@ -5,58 +15,48 @@ easy_install-3.4 = setuptools.command.easy_install:main
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
 
-[egg_info.writers]
-requires.txt = setuptools.command.egg_info:write_requirements
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-entry_points.txt = setuptools.command.egg_info:write_entries
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-
 [distutils.setup_keywords]
-test_loader = setuptools.dist:check_importable
-tests_require = setuptools.dist:check_requirements
-install_requires = setuptools.dist:check_requirements
-include_package_data = setuptools.dist:assert_bool
-eager_resources = setuptools.dist:assert_string_list
-packages = setuptools.dist:check_packages
+exclude_package_data = setuptools.dist:check_package_data
 use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-use_2to3_fixers = setuptools.dist:assert_string_list
+use_2to3 = setuptools.dist:assert_bool
+dependency_links = setuptools.dist:assert_string_list
+test_loader = setuptools.dist:check_importable
 convert_2to3_doctests = setuptools.dist:assert_string_list
+extras_require = setuptools.dist:check_extras
 package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-dependency_links = setuptools.dist:assert_string_list
-exclude_package_data = setuptools.dist:check_package_data
+include_package_data = setuptools.dist:assert_bool
 test_suite = setuptools.dist:check_test_suite
-entry_points = setuptools.dist:check_entry_points
-use_2to3 = setuptools.dist:assert_bool
+install_requires = setuptools.dist:check_requirements
 zip_safe = setuptools.dist:assert_bool
-extras_require = setuptools.dist:check_extras
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+entry_points = setuptools.dist:check_entry_points
+namespace_packages = setuptools.dist:check_nsp
+tests_require = setuptools.dist:check_requirements
+packages = setuptools.dist:check_packages
+use_2to3_fixers = setuptools.dist:assert_string_list
+eager_resources = setuptools.dist:assert_string_list
 
 [distutils.commands]
-sdist = setuptools.command.sdist:sdist
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-test = setuptools.command.test:test
-build_py = setuptools.command.build_py:build_py
-easy_install = setuptools.command.easy_install:easy_install
-develop = setuptools.command.develop:develop
-build_ext = setuptools.command.build_ext:build_ext
-rotate = setuptools.command.rotate:rotate
+upload_docs = setuptools.command.upload_docs:upload_docs
 egg_info = setuptools.command.egg_info:egg_info
-install_lib = setuptools.command.install_lib:install_lib
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 register = setuptools.command.register:register
+install_lib = setuptools.command.install_lib:install_lib
 install_scripts = setuptools.command.install_scripts:install_scripts
-alias = setuptools.command.alias:alias
-upload_docs = setuptools.command.upload_docs:upload_docs
-setopt = setuptools.command.setopt:setopt
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
 saveopts = setuptools.command.saveopts:saveopts
+rotate = setuptools.command.rotate:rotate
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+develop = setuptools.command.develop:develop
+alias = setuptools.command.alias:alias
 install = setuptools.command.install:install
+build_ext = setuptools.command.build_ext:build_ext
+build_py = setuptools.command.build_py:build_py
+sdist = setuptools.command.sdist:sdist
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+easy_install = setuptools.command.easy_install:easy_install
+setopt = setuptools.command.setopt:setopt
+test = setuptools.command.test:test
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 9a6bf437..4fd464d8 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,7 @@
 
 
-[certs]
-certifi==0.0.8
-
 [ssl:sys_platform=='win32']
-wincertstore==0.1
\ No newline at end of file
+wincertstore==0.1
+
+[certs]
+certifi==0.0.8
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index d980f276..2b9ccf17 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '2.1'
+__version__ = '2.2'