Merge branch '3.0'

Conflicts:
	requirements/default-py3k.txt
	requirements/default.txt
	setup.cfg

requirements/default-py3k.txt

@@ -1,4 +1,4 @@
-billiard>=2.7.3.12
+billiard>=2.7.3.13
 python-dateutil>=2.1
-pytz
 kombu>=2.4.6,<3.0
+pytz

requirements/default.txt

@@ -1,3 +1,3 @@
-billiard>=2.7.3.12
+billiard>=2.7.3.13
 python-dateutil>=2.1
 kombu>=2.4.6,<3.0

setup.cfg

@@ -14,6 +14,6 @@ all_files = 1
 upload-dir = docs/.build/html
 
 [bdist_rpm]
-requires = billiard>=2.7.3.12
+requires = billiard>=2.7.3.13
            python-dateutil >= 2.1
            kombu >= 2.4.6