Merge remote-tracking branch 'qemu/master'
commit3615b3590199829d2c7f0472a3c914adb918b8df
authorStefan Weil <sw@weilnetz.de>
Fri, 1 Aug 2014 14:44:10 +0000 (1 16:44 +0200)
committerStefan Weil <sw@weilnetz.de>
Fri, 1 Aug 2014 14:44:10 +0000 (1 16:44 +0200)
tree7478bc731d4dc8a75294a2861556523eee13f6c9
parent8438f451f39ac908040475f3480237c6b100f467
parent541bbb07eb197a870661ed702ae1f15c7d46aea6
Merge remote-tracking branch 'qemu/master'