Conflicts:

	doc/rapi.rst
	lib/ovf.py

Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>