Merge branch 'kvm' slapos-0.24
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 15 Jul 2011 09:03:12 +0000 (11:03 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 15 Jul 2011 09:03:12 +0000 (11:03 +0200)
commitb1d10a5e4024a4797f2f0666f8727c55872b851f
treecfe5321060d66cfe9f2e99455335069461c21172
parent89c45e7eaae54d57fd1866a9bcef3a436bc27d37
parenta9a314ca45111a247f6e3d3a25a6228b587d942a
Merge branch 'kvm'