Merge branch 'master' into branch-2.1

author Guido Trotter <ultrotter@google.com>

Wed, 20 May 2009 13:16:16 +0000 (14:16 +0100)

committer Guido Trotter <ultrotter@google.com>

Wed, 20 May 2009 13:16:16 +0000 (14:16 +0100)
author Guido Trotter <ultrotter@google.com>
Wed, 20 May 2009 13:16:16 +0000 (14:16 +0100)
committer Guido Trotter <ultrotter@google.com>
Wed, 20 May 2009 13:16:16 +0000 (14:16 +0100)
diff --cc configure.ac
Simple merge
diff --cc doc/rapi.rst
Simple merge
diff --cc lib/cmdlib.py
Simple merge
diff --cc lib/hypervisor/hv_kvm.py
Simple merge
diff --cc man/gnt-instance.sgml
Simple merge
diff --cc scripts/gnt-instance
Simple merge
author	Guido Trotter <ultrotter@google.com>
	Wed, 20 May 2009 13:16:16 +0000 (14:16 +0100)
committer	Guido Trotter <ultrotter@google.com>
	Wed, 20 May 2009 13:16:16 +0000 (14:16 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
doc/rapi.rst	patch \|	diff1 \|	diff2 \|	blob \| history
lib/cmdlib.py	patch \|	diff1 \|	diff2 \|	blob \| history
lib/hypervisor/hv_kvm.py	patch \|	diff1 \|	diff2 \|	blob \| history
man/gnt-instance.sgml	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/gnt-instance	patch \|	diff1 \|	diff2 \|	blob \| history