Ensure was retrying one more time than max_retries
Tests passing
librabbitmq: Remove cyclic reference at connection close
Fixes funtests
Adds functional tests for pyamqp transport
Adds functional tests for librabbitmq transport
force_close_all should not acquire mutex
eventio: Fixes select bad file descriptor handling
Pidbox: publish reply should ignore InconsistencyError
fixes typo
Adds Connection.collect to close circular refs without I/O
Merge branch '2.5'

Conflicts:
	kombu/pidbox.py
	kombu/utils/__init__.py
	kombu/utils/eventio.py
Don't bind queues to the default exchange - Fixes #209
Adds Jonathan Halcrow to AUTHORS
Merge branch '2.5'
Merge branch 'master' of github.com:celery/kombu
Fixes simple task queue example.  Closes #230
Merge remote-tracking branch 'upstream/master'