Merge branch 'kvm'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 7 Sep 2011 14:55:48 +0000 (16:55 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 7 Sep 2011 14:55:48 +0000 (16:55 +0200)
commit5612f13355fbd9662ec1186e1b34244e371b793a
tree875dea7108fb97f1d3d58b5ea59b54c6aa994901
parent9222221080c8f8200ed1f29d0714f88ade5f3803
parentb086cbd5a316399b75e996de48ba73d2f0c3846e
Merge branch 'kvm'

Conflicts:
software/kvm/software.cfg
stack/kvm.cfg
software/kvm/software.cfg