Merge branch 'queues/slirp' of git://git.kiszka.org/qemu
authorBlue Swirl <blauwirbel@gmail.com>
Sun, 21 Aug 2011 19:19:29 +0000 (19:19 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Sun, 21 Aug 2011 19:19:29 +0000 (19:19 +0000)
* 'queues/slirp' of git://git.kiszka.org/qemu:
  slirp: Fix bit field types in IP header structs


Trivial merge