modified:   TODO
	modified:   build/cassandra/cassandra.yaml.tmpl
	modified:   build/cassandra/log4j-server.properties
	modified:   build/client/crawler/config.properties
	modified:   build/kconfig
	modified:   qemu/blank.iso
	modified:   qemu/lqemu.sh
	modified:   TODO
	modified:   build/cassandra/cassandra.yaml.tmpl
	modified:   build/cassandra/log4j-server.properties
	modified:   build/client/crawler/config.properties
	modified:   qemu/blank.iso
	modified:   qemu/lqemu.sh
	modified:   TODO
	modified:   build/bashprofile
	new file:   build/cassandra/cassandra-env.sh
	modified:   build/cassandra/cassandra.yaml.tmpl
	modified:   build/cassandra/log4j-server.properties
	modified:   build/client/crawler/config.properties
	new file:   build/client/crawler/crawler.jar
	modified:   build/kconfig
	new file:   build/zookeeper/log4j.properties
	new file:   scripts/configuration.sh
	new file:   scripts/deploy-netem.sh
	renamed:    install.sh -> scripts/install.sh
	new file:   scripts/undeploy-netem.sh
Merge branch 'master' of https://github.com/otrack/Leads-opennebula

Conflicts:
	TODO