Merge branch 'master' into next
authorGuido Trotter <ultrotter@google.com>
Wed, 20 May 2009 13:13:56 +0000 (14:13 +0100)
committerGuido Trotter <ultrotter@google.com>
Wed, 20 May 2009 13:14:34 +0000 (14:14 +0100)
Signed-off-by: Guido Trotter <ultrotter@google.com>

1  2 
daemons/ganeti-watcher
lib/cmdlib.py
lib/hypervisor/hv_kvm.py
man/gnt-instance.sgml
scripts/gnt-instance

Simple merge
diff --cc lib/cmdlib.py
Simple merge
Simple merge
Simple merge
Simple merge