cleanup
merge from 1.1
Merge branch 'cassandra-1.2' into trunk