Merge branch 'master' into kvm slapos-0.83
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 26 Apr 2012 18:32:30 +0000 (20:32 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 26 Apr 2012 18:32:30 +0000 (20:32 +0200)
commit987ab29bba8809117007534d3c6ec8073e57f548
treedb740e20ae0324118c407b681f9c7a3eade7c451
parentf5f1a706cc6b0cf83a0d3144d3200d23f74b6550
parent877275f81ca916d25e4c07825057d8f87540866b
Merge branch 'master' into kvm

Conflicts:
software/kvm/software.cfg