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

Conflicts:
	kombu/utils/eventio.py