Merge commit 'hdt/master' syslinux-3.74-pre16
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 3 Apr 2009 23:51:27 +0000 (16:51 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 3 Apr 2009 23:51:27 +0000 (16:51 -0700)

Trivial merge