merged from cassandra-0.4 branch

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@810282 13f79535-47bb-0310-9956-ffa450edef68

NOTICE.txt

@@ -5,3 +5,10 @@ This product includes software developed by The Apache Software
 Foundation (http://www.apache.org/).
 
 Developers and Contributors are listed in the project POM file
+
+JSON support is provided by Flexjson (http://flexjson.sf.net).
+Copyright 2007 Charlie Hubbard.
+
+This product makes use of the google-collections library from
+http://code.google.com/p/google-collections/.
+Copyright (C) 2008 Google Inc.

src/java/org/apache/cassandra/service/CassandraServer.java

@@ -509,7 +509,7 @@ public class CassandraServer implements Cassandra.Iface
         }
         else if (propertyName.equals("version"))
         {
-            return "0.3.0";
+            return "0.4.0";
         }
         else
         {