ocd
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	NEWS.txt
Merge branch 'cassandra-2.0' into trunk