Correctly expire gossip states for edge cases.
Patch by yangwei, reviewed by brandonwilliams for CASSANDRA-5216
Merge branch 'cassandra-1.2' into trunk
Correctly expire gossip states for edge cases.
Patch by yangwei, reviewed by brandonwilliams for CASSANDRA-5216
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	CHANGES.txt