Merge branch 'master' into kvm
authorVivien Alger <algervivie@tiolive.com>
Wed, 13 Jul 2011 09:32:06 +0000 (11:32 +0200)
committerVivien Alger <algervivie@tiolive.com>
Wed, 13 Jul 2011 09:32:06 +0000 (11:32 +0200)
commit91ad35a0ee65a1fafda5ade9c2984a70da8a5148
tree737a067f7d71423cbcb13aa82fd49c019cbf789c
parent7034e4af111f3d32d7d9e2005958b494a220cb33
parent0532b434f1f44f56ae8c7c914faac32b1c28aa07
Merge branch 'master' into kvm