netty 3.6.2
Merge branch 'netty-3.6.2' into smallrivers

Conflicts:
	project.clj