Include patch from #171
Merge branch 'master' of github.com:celery/kombu