Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

.gitignore

@@ -14,3 +14,5 @@ dist/
 *.bak
 cloud-*.tar.bz2
 *.log
+*.pyc
+build.number

client/bindir/cloud-update-xenserver-licenses.in

@@ -125,7 +125,7 @@ except IndexError: e("The first argument must be the license file to use")
 
 if options.all:
 	if len(args) != 0: e("IP addresses cannot be specified if -a is specified")
-	config = cloud_utils.read_properties(cfg)
+	config = read_properties(cfg)
 	creds = getknownhosts(config["db.cloud.host"],config["db.cloud.username"],config["db.cloud.password"])
 	hosts = creds.keys()
 else:

cloud.spec

@@ -232,6 +232,9 @@ Requires: %{name}-daemonize
 Requires: /sbin/service
 Requires: /sbin/chkconfig
 Requires: kvm
+%if 0%{?fedora} >= 13
+Requires: cloud-qemu-system-x86
+%endif
 Requires: libcgroup
 Requires: /usr/bin/uuidgen
 Requires: augeas >= 0.7.1