Marek Marczykowski 4daa5f56ea Merge branch 'master-for-hvm' into hvm ... Conflicts: dom0/qvm-core/qubes.py dom0/qvm-tools/qvm-sync-clock		2012-10-04 05:45:41 +02:00
..
core-vm-kernel-placeholder.spec	vm/kernel-placeholder: simplify upgrade	2012-07-30 23:16:05 +02:00
core-vm.spec	Merge branch 'master-for-hvm' into hvm	2012-10-04 05:45:41 +02:00