Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/joanna/core into spring-merge

rpm_spec/core-commonvm.spec

@@ -33,6 +33,7 @@ License:	GPL
 URL:		http://www.qubes-os.org
 Requires:	/usr/bin/xenstore-read
 Requires:   fedora-release
+BuildRequires: xen-devel
 
 %define _builddir %(pwd)/common
 

version_vm

@@ -1 +1 @@
-1.5.2
+1.5.4