From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 13 Apr 2012 13:04:43 +0000 (-0500)
Subject: Merge remote-tracking branch 'stefanha/trivial-patches' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7672725d41d1a04195affc1a7bd5676ba6314b14;p=qemu.git

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

* stefanha/trivial-patches:
  configure: Insist on a Python 2, not Python 3
  bsd-user: fix compile failure
  ps2: avoid repeated header file includes
  make: Always set LC_ALL=C for makeinfo
  configure: Fix wrong preprocessor statement
  configure: Remove useless uses of ARCH_CFLAGS
---

7672725d41d1a04195affc1a7bd5676ba6314b14