From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 18 Jun 2012 15:18:26 +0000 (-0500)
Subject: Merge remote-tracking branch 'sweil/for-anthony' into staging
X-Git-Tag: v1.2.0-rc0~271
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49023ff78cf1efeb861b475c40dd04262efe61d3;p=thirdparty%2Fqemu.git

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

* sweil/for-anthony:
  Fix some more license versions (GPL2+ instead of GPL2)
  dump: Fix license version (GPL2+ instead of GPL2)
  configure: Fix build for some versions of glibc (9pfs)
  monitor: Fix memory leak with readline completion
---

49023ff78cf1efeb861b475c40dd04262efe61d3