Fix for issue #1326

https://github.com/celery/celery/issues/1326

Fixes error when running celery commands:

wh@wh:~/flo/bin$ ./celery worker
Traceback (most recent call last):
  File "./celery", line 8, in <module>
    load_entry_point('celery==3.1.0rc1', 'console_scripts', 'celery')()
  File "/home/wh/flo/local/lib/python2.7/site-packages/celery/__main__.py", line 28, in main
    maybe_patch_concurrency()
  File "/home/wh/flo/local/lib/python2.7/site-packages/celery/__main__.py", line 23, in maybe_patch_concurrency
    from celery.platforms import maybe_patch_concurrency
  File "/home/wh/flo/local/lib/python2.7/site-packages/celery/platforms.py", line 269
    <<<<<<< HEAD
    ^