Merge remote-tracking branch 'kraxel/CVE-2011-1751' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 25 May 2011 12:04:13 +0000 (07:04 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 25 May 2011 12:04:13 +0000 (07:04 -0500)

Trivial merge