Merge remote-tracking branch 'kiszka/queues/slirp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 5 Aug 2011 17:17:04 +0000 (12:17 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 5 Aug 2011 17:17:04 +0000 (12:17 -0500)

Trivial merge