Merge branch 'cassandra-1.0' into cassandra-1.1.0