Merge 3.4 into default - Upgrade setuptools to 12.0.5 and pip to 6.0.7

Lib/ensurepip/__init__.py

@@ -8,9 +8,9 @@ import tempfile
 __all__ = ["version", "bootstrap"]
 
 
-_SETUPTOOLS_VERSION = "11.3.1"
+_SETUPTOOLS_VERSION = "12.0.5"
 
-_PIP_VERSION = "6.0.6"
+_PIP_VERSION = "6.0.7"
 
 # pip currently requires ssl support, so we try to provide a nicer
 # error message when that is missing (http://bugs.python.org/issue19744)