Merge branch 'master' of git.qemu.org:/pub/git/qemu
authorBlue Swirl <blauwirbel@gmail.com>
Sun, 7 Oct 2012 18:42:18 +0000 (18:42 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Sun, 7 Oct 2012 18:42:18 +0000 (18:42 +0000)
* 'master' of git.qemu.org:/pub/git/qemu:
  qemu-barrier: Fix compilation on i386 hosts


Trivial merge