Merge branch 'master' into kvm
authorVivien Alger <algervivie@tiolive.com>
Tue, 5 Jul 2011 06:55:27 +0000 (08:55 +0200)
committerVivien Alger <algervivie@tiolive.com>
Tue, 5 Jul 2011 06:55:27 +0000 (08:55 +0200)
commit9de8cdd5db3e943ad58bfbebf567a0aa08d6f29c
tree19e0c624cc6ba8e5aff3d01a3e5359b8d67a06dc
parent020eafcba91eb4e203a2bffecb46105554d2b5cf
parent5b18969ffe4b2742683ad71dc875df0dc128953f
Merge branch 'master' into kvm