Merge branch 'kvm' slapos-0.25
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 15 Jul 2011 11:09:47 +0000 (13:09 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 15 Jul 2011 11:09:47 +0000 (13:09 +0200)
commitdc879904ca6adfd2eefbe6c13fc9819e20bad96c
tree60d9138b586c4e0b682a5fc56a7036dc06db181b
parent527a7dc5563773857da53971350494c8401fd980
parent18d01df12beb5163f6fce9ae791092bbefe160a8
Merge branch 'kvm'