Merge 3485 from 0.8


git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1212631 13f79535-47bb-0310-9956-ffa450edef68
4 files changed