Merge remote-tracking branch 'qemu/master'
commitb1770e1baf9b5a33be98da0ec495701cf287badd
authorStefan Weil <sw@weilnetz.de>
Tue, 1 Jul 2014 20:48:54 +0000 (1 22:48 +0200)
committerStefan Weil <sw@weilnetz.de>
Tue, 1 Jul 2014 20:48:54 +0000 (1 22:48 +0200)
treea0df1549cfe848275ac9aac91a156cc246afb542
parente560eedd429a38a83d2d83154b1f81573761f03a
parent92259b7f434b382fc865d1f65f7d5adeed295749
Merge remote-tracking branch 'qemu/master'