Merge branch 'kvm' slapos-0.22
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 13 Jul 2011 15:35:05 +0000 (17:35 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 13 Jul 2011 15:35:05 +0000 (17:35 +0200)
commit6c4b16dca45f061e025b1a84968a5f856178f75b
tree57b9c92aa639de2be401b88403bd54d87afea1f3
parent282d966a482f8f56cfabd6eeb48e580e28252ab0
parentb55471fe17fc9f2901835688ba4f1739baf2c7f4
Merge branch 'kvm'