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/d39ec221
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d39ec221
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d39ec221
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/0eca1652
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0eca1652
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0eca1652