cleanup
Merge branch 'cassandra-1.2' into trunk
rename
Merge branch 'cassandra-1.2' into trunk
cleanup
rename
Merge remote-tracking branch 'origin/trunk' into trunk
fix capitalization of file name
Merge branch 'cassandra-1.2' into trunk