comment
Merge branch 'cassandra-1.2' into trunk
revert CASSANDRA-5151 from 1.2
Merge branch 'cassandra-1.2' into trunk