Fix small bug in handling SemanticVersion
Update version for 1.2.1 release
Merge branch 'cassandra-1.2' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2
Fix start key/end token validation for wide row iteration.
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-5168
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/thrift/ThriftValidation.java
Merge branch 'cassandra-1.2' into trunk