lkairies-hadoop2_compatibility: Changed to new hadoop common library.
lkairies-hadoop2_compatibility/contrib: Added support for Hadoop 2.x.
docs: Added Hadoop 2.x setup to user guide.
lkairies-hadoop-ssl-support/contrib: Added SSL support to XtreemFSHadoopClient.
lkairies-hadoop-ssl-support/contrib: Changed trusted certifactes file and passphrases for trusted certifactes file and credential file to optional parameters.
lkairies-hadoop-ssl-support/tests: Added test for hadoop with ssl.
tests: Fixed dir parameter in xtfs_benchmark test script
tests: disabled replicated_war1 volume for xtfs_benchmark test
Added make targets to build pbrpcgen and interfaces
lkairies-hadoop2_integration/docs: Changed HADOOP_HOME to HADOOP_PREFIX in Hadoop quick start section.
lkairies-hadoop2_integration/contrib: Removed setConfig() method from XtreemFSHadoopClient.
lkairies-hadoop2_integration/contrib, docs: Re-named XtfsFileSystem to XtreemFS and updated xtreemfs user guide.
Merge branch 'lkairies-hadoop2_integration'

Conflicts:
	contrib/hadoop/src/org/xtreemfs/common/clients/hadoop/XtreemFSFileSystem.java
	doc/xtreemfs-userguide/xtfs-guide.pdf
	doc/xtreemfs-userguide/xtfs-guide.tex
lkairies-hadoop-ssl-support/docs: Added description of SSL usage to hadoop quick start section.
contrib: fixed dependencies in hadoop client nbproject
tests: Added output verification in hadoop test.
Merge branch 'lkairies-hadoop-ssl-support'

Conflicts:
	doc/xtreemfs-userguide/xtfs-guide.pdf
	doc/xtreemfs-userguide/xtfs-guide.tex
	tests/test_config.py
jens-benchmark/server: Improve benchmark.sh script

Delete (obsolte) restarting of servers from the script. Add cleanup after inter-
rupts and better size handling. Keep the size of the basefiles constant over
multi-thread benchmarks.
tests: Added test for Hadoop 2.x.