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

celery/app/base.py

@@ -221,7 +221,6 @@ class Celery(object):
             '__doc__': fun.__doc__,
             '__module__': fun.__module__}, **options))()
         task = self._tasks[T.name]  # return global instance.
-        task.bind(self)
         return task
 
     def finalize(self):

examples/httpexample/manage.py

@@ -6,7 +6,7 @@ except ImportError:
     import sys
     sys.stderr.write(
         "Error: Can't find the file 'settings.py' in the directory "
-        "containing {0!r}.".format(__file__)
+        "containing {0!r}.".format(__file__))
     sys.exit(1)
 
 if __name__ == '__main__':