Merge remote branch 'upstream/master'

Makefile

build.xml

changes

db/cassandra-0.5/src/com/yahoo/ycsb/db/CassandraClient5.java

db/cassandra-0.6/src/com/yahoo/ycsb/db/CassandraClient6.java

db/cassandra-0.7/src/com/yahoo/ycsb/db/CassandraClient7.java

db/cassandra-0.8/src/com/yahoo/ycsb/db/CassandraClient8.java

db/hbase/src/com/yahoo/ycsb/db/HBaseClient.java

...nfinispan-5.0/src/com/yahoo/ycsb/db/InfinispanClient.java

db/jdbc/src/com/yahoo/ycsb/db/JdbcDBClient.java

db/mongodb/src/com/yahoo/ycsb/db/MongoDbClient.java

db/redis/src/com/yahoo/ycsb/db/RedisClient.java

db/voldemort/src/com/yahoo/ycsb/db/VoldemortClient.java

src/com/yahoo/ycsb/BasicDB.java

src/com/yahoo/ycsb/ByteArrayByteIterator.java

src/com/yahoo/ycsb/ByteIterator.java

src/com/yahoo/ycsb/Client.java

src/com/yahoo/ycsb/CommandLine.java

src/com/yahoo/ycsb/DB.java

src/com/yahoo/ycsb/DBWrapper.java