Merge remote-tracking branch 'origin/kvm' into kvm
authorRomain Courteaud <romain@nexedi.com>
Mon, 9 Jan 2012 17:17:33 +0000 (18:17 +0100)
committerRomain Courteaud <romain@nexedi.com>
Mon, 9 Jan 2012 17:17:33 +0000 (18:17 +0100)
commitdfd766cfef033de932b1419d1f4ad121178dcd5a
tree551f411c2c38d2734c2c753fad098ba8564c59dd
parent8da8de5196bdbcdb2f5968a12dacc819bffe5ac7
parent9a92cc2bad7bfb7f2e69ba0edea79563a1fdee98
Merge remote-tracking branch 'origin/kvm' into kvm