merged + removed trailing spaces

--HG--
branch : distribute
extra : rebase_source : 343481c01063bac16767023dd7a24bb0b063b967

distribute.egg-info/entry_points.txt

@@ -31,7 +31,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl

tests/test_distribute_setup.py

@@ -45,7 +45,6 @@ class TestSetup(unittest.TestCase):
         self.assert_(setuptools.__file__.startswith(egg))
 
     def test_do_download(self):
-
         tmpdir = tempfile.mkdtemp()
         _do_download(to_dir=tmpdir)
         import setuptools