Merge branch 'jasonbaker/master' into 1point0

Conflicts:
	celery/bin/celeryd.py
	celery/tests/test_backends/test_database.py
	celery/tests/utils.py

FAQ

@@ -49,7 +49,7 @@ points are not specific to celery; If using Redis/database as a queue worked
 fine for you before, it probably will now. And you can always upgrade later.
 
 Is celery multi-lingual?
------------------------
+------------------------
 
 **Answer:** Yes.
 

README.rst

@@ -267,6 +267,7 @@ advanced features of celery later.
 
 This is a task that basically does nothing but take some arguments,
 and return a value:
+::
 
     from celery.task import Task
     from celery.registry import tasks
@@ -423,3 +424,4 @@ This software is licensed under the ``New BSD License``. See the ``LICENSE``
 file in the top distribution directory for the full license text.
 
 .. # vim: syntax=rst expandtab tabstop=4 shiftwidth=4 shiftround
+

celery/tests/utils.py

@@ -2,7 +2,6 @@ from __future__ import with_statement
 from contextlib import contextmanager
 from StringIO import StringIO
 from functools import wraps
-import os
 import sys
 import __builtin__