merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2531424c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2531424c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2531424c
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a9120bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a9120bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a9120bb