Merge remote-tracking branch 'genec/memdiskdbg-for-sha0' syslinux-4.04-pre17
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 1 Apr 2011 23:53:22 +0000 (16:53 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 1 Apr 2011 23:53:22 +0000 (16:53 -0700)

Trivial merge