Added by Anthony Liguori almost 13 years ago
Merge remote-tracking branch 'kiszka/queues/slirp' into staging