clean up merge
Merge branch 'cassandra-1.2' into trunk