fix addCallback for XDC requests too
merge from 1.2
Merge branch 'cassandra-2.0' into trunk
one more consistencyLevel to pass along
merge from 1.2
Merge branch 'cassandra-2.0' into trunk
last one?
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk