Merge branch 'kvm' slapos-0.132
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 18 Oct 2012 12:53:16 +0000 (14:53 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 18 Oct 2012 12:53:16 +0000 (14:53 +0200)
commit3806c6ff9bae04250766ca202d0bace86fb35e5c
treec23ae72aca792096ef3e2840495fb57121e15a99
parent41145f3208f477f8f4a28be73194e1dd8960a30f
parent4e5626f8767854e68127291ab973fccabc5005b5
Merge branch 'kvm'