Update version for 1.1.9 release
Make Ec2Region's datacenter name configurable
patch by Jason Brown; reviewed by Vijay for CASSANDRA-5155
Merge branch 'cassandra-1.2' into trunk
Detect memory for heap sizing on OSX.
Patch by Cathy Daw, reviewed by brandonwilliams for CASSANDRA-5157
Exclude all system-related CFs from CFS.allUserDefined()
Patch by Jason Brown, reviewed by brandonwilliams for CASSANDRA-5160
Merge branch 'cassandra-1.2' into trunk
Don't remove tokens for node we know in System.peers

patch by slebresne; reviewed by driftx for CASSANDRA-5121
Merge branch 'cassandra-1.2' into trunk
Fix tests post-#5121
Merge branch 'cassandra-1.2' into trunk
Don't update local tokens when localTokensToRemove is empty
Merge branch 'cassandra-1.2' into trunk
remove gms cruft
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	build.xml
	debian/changelog
	src/java/org/apache/cassandra/gms/PureRandom.java
Merge branch 'cassandra-1.2' into trunk
fix streaming progress report for compressed files; patch by yukim reviewed by mkjellman for CASSANDRA-5130
Merge branch 'cassandra-1.2' into trunk
r/m unused SimpleTransportFactory
default native proto to correct port in Config
Merge branch 'cassandra-1.2'