remove merge markers
Merge branch 'cassandra-1.2' into trunk