updated for 1.1.11 release
fix corrupt changelog
Add retry mechanism to OTC for non-droppable_verbs
patch by jasobrown; reviewed by jbellis for CASSANDRA-5393
add 5393 to CHANGES.txt
Use allocator information to improve memtable memory usage estimate
patch by jbellis; reviewed by jasobrown for CASSANDRA-5497
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	CHANGES.txt
	build.xml
	debian/changelog
	src/java/org/apache/cassandra/net/OutboundTcpConnection.java
Merge branch 'cassandra-1.2' into trunk
merge from 1.1
Merge branch 'cassandra-1.2' into trunk