implementing CL.LOCAL_ONE
Merge branch '6202' into 6202_2.0
apply local_one changes to 2.0
implementing CL.LOCAL_ONE
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch '6202_2.0' into cassandra-2.0
add update cql-internal-only zip
Merge branch 'cassandra-2.0' into trunk
updated news and changes
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	NEWS.txt
Merge branch 'cassandra-2.0' into trunk