Update versions for 2.0.1 release
allow parenthesis around where conditions in cql
patch by dbrosius reviewed by slebresne for cassandra-6037
Merge branch 'cassandra-1.2' into cassandra-2.0
Replace Iterable->Collection in SSTCN

ninja-patch by Aleksey Yeschenko; ninja-reviewed by Jonathan Ellis
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	NEWS.txt
	build.xml