From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 14 May 2012 15:06:50 +0000 (-0500)
Subject: Merge remote-tracking branch 'sweil/for-1.1' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=82ac96a72b860f6a4f125edd12f85cb21b3d66bf;p=qemu.git

Merge remote-tracking branch 'sweil/for-1.1' into staging

* sweil/for-1.1:
  qemu-doc: Use QEMU instead of qemu for product name
  qemu-doc: Fix executable name in examples
  qemu-doc: Add missing parameter in description of -D option
  configure: Use QEMU instead of Qemu
  fix some common typos
  qemu-timer: Fix wrong error message
---

82ac96a72b860f6a4f125edd12f85cb21b3d66bf