Merge remote-tracking branch 'qemu/master'
commit19654b57e0dbfa80ce5e54993f4b04e838acad02
authorStefan Weil <sw@weilnetz.de>
Mon, 5 Aug 2013 18:52:45 +0000 (5 20:52 +0200)
committerStefan Weil <sw@weilnetz.de>
Mon, 5 Aug 2013 18:52:45 +0000 (5 20:52 +0200)
treeb7c9d852f8a4b6f1de2520ede957efda764d9e09
parentef2cc7ad4d40a65358ae69e0be3147422b7691d9
parent79761c6681f0d1cc1c027116fcb4382d41ed3ece
Merge remote-tracking branch 'qemu/master'