Merge branch '3.0'

Conflicts:
	celery/utils/imports.py
	celery/utils/threads.py

CONTRIBUTORS.txt

@@ -132,3 +132,4 @@ Pär Wieslander, 2013/03/20
 Theo Spears, 2013/03/28
 Romuald Brunet, 2013/03/29
 Aaron Harnly, 2013/04/04
+Peter Brook, 2013/05/09

celery/utils/imports.py

@@ -30,6 +30,7 @@ if sys.version_info > (3, 3):
             obj = obj.__class__
         return '.'.join((obj.__module__,
                          getattr(obj, '__qualname__', None) or obj.__name__))
+
 else:
     def qualname(obj):  # noqa
         if not hasattr(obj, '__name__') and hasattr(obj, '__class__'):

celery/utils/threads.py

@@ -21,7 +21,6 @@ from celery.five import THREAD_TIMEOUT_MAX, items
 
 USE_FAST_LOCALS = os.environ.get('USE_FAST_LOCALS')
 PY3 = sys.version_info[0] == 3
-NEW_EVENT = (sys.version_info[0] == 3) and (sys.version_info[1] >= 3)
 
 
 class bgThread(threading.Thread):