Merge remote-tracking branch 'qemu/master'
commitdd9af313318abeab8115ae5beba67c3abe3d9d62
authorStefan Weil <sw@weilnetz.de>
Sun, 29 Jun 2014 16:34:36 +0000 (29 18:34 +0200)
committerStefan Weil <sw@weilnetz.de>
Sun, 29 Jun 2014 16:34:36 +0000 (29 18:34 +0200)
tree421ea855c9e505924cac850dbde8b995793cc873
parent082e0e3e064a35d23d6100f7f2a91899e5eeb6bf
parent4daebe014effba37246b81d25acca5fa2df82f01
Merge remote-tracking branch 'qemu/master'