Merge branch 'master' of github.com:ask/celery

setup.cfg

@@ -32,9 +32,12 @@ all_files = 1
 upload-dir = docs/.build/html
 
 [bdist_rpm]
-requires = python-uuid
-           python-importlib
-           python-multiprocessing==2.6.2.1
+requires = uuid
+           importlib
+           multiprocessing == 2.6.2.1
            python-dateutil
-           python-anyjson
-           python-carrot>=0.10.4
+           anyjson
+           carrot >= 0.10.5
+           mailer
+           SQLAlchemy
+           pyparsing