Merge CASSANDRA-2431 from 0.7


git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1089980 13f79535-47bb-0310-9956-ffa450edef68
3 files changed