Patch by eevans and paul cannon for CASSANDRA-1689 git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1048903 13f79535-47bb-0310-9956-ffa450edef68