Merge remote branch 'sha0/com32lib_disk' into disklib
authorH. Peter Anvin <hpa@linux.intel.com>
Wed, 21 Jul 2010 20:52:52 +0000 (13:52 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Wed, 21 Jul 2010 20:52:52 +0000 (13:52 -0700)

Trivial merge