Merge remote-tracking branch 'qemu/master'
commit248b40889f891b2e63376d84943a35bd9e8ef98f
authorStefan Weil <sw@weilnetz.de>
Thu, 4 Sep 2014 19:36:24 +0000 (4 21:36 +0200)
committerStefan Weil <sw@weilnetz.de>
Thu, 4 Sep 2014 19:36:24 +0000 (4 21:36 +0200)
treefccc0960bb6f85cbc875c202d14329dd6d2a8b93
parentfb77e9e5e1b6f9f256df3a5be0f7a50f119d68f1
parentbbb6a1e872a6f0d6c43913726b2229c0cbdd3220
Merge remote-tracking branch 'qemu/master'