6132
CHANGES
merge from 1.2
comment
Merge branch 'cassandra-1.2' into cassandra-2.0