Merge branch 'cassandra-1.1' into cassandra-1.2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
Disallow counters in collection

patch by slebresne; reviewed by jbellis for CASSANDRA-5082
Merge branch 'cassandra-1.2.0' into cassandra-1.2

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-1.2' into trunk
formatting
Minimize byte array allocation by AbstractData{Input,Output}
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-5090
merge from 1.2
Improve handling a changing target throttle rate mid-compaction
patch by J.B. Langston; reviewed by jbellis for CASSANDRA-5087
Merge branch 'cassandra-1.2' into trunk
Improve handling a changing target throttle rate mid-compaction
patch by J.B. Langston; reviewed by jbellis for CASSANDRA-5087
Merge branch 'cassandra-1.1' into cassandra-1.2.0
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
improve compaction result logging
Merge branch 'cassandra-1.2' into trunk
improve validation for start key, end token ranges
patch by jbellis; reviewed by dbrosius for CASSANDRA-5089
Merge branch 'cassandra-1.1' into cassandra-1.2.0
Merge branch 'cassandra-1.2.0' into cassandra-1.2