Merge remote-tracking branch 'kraxel/usb.7.pull' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 5 May 2011 18:04:57 +0000 (13:04 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 5 May 2011 18:04:57 +0000 (13:04 -0500)

Trivial merge