Merge remote-tracking branch 'qemu/master'
commit80c8e84ad99d07a898ed8b4a0f7433b474fdc74b
authorStefan Weil <sw@weilnetz.de>
Thu, 28 Nov 2013 05:33:33 +0000 (28 06:33 +0100)
committerStefan Weil <sw@weilnetz.de>
Thu, 28 Nov 2013 05:33:33 +0000 (28 06:33 +0100)
treeefc134d0ddea44b1ba864139be1a78ba43dafc57
parentf7e5b9d5e9d7d46562ea594277edf6f80d4f5627
parent7dc65c02fe3fb8f3146ce0b9ff5fec5945329f0e
Merge remote-tracking branch 'qemu/master'