Merge remote-tracking branch 'kraxel/usb.14.pull' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 31 May 2011 13:17:15 +0000 (08:17 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 31 May 2011 13:17:15 +0000 (08:17 -0500)

Trivial merge