Merge branch 'master' of ssh://terminus.zytor.com/pub/git/syslinux/syslinux
authorH. Peter Anvin <hpa@linux.intel.com>
Thu, 1 Jul 2010 19:47:02 +0000 (12:47 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 1 Jul 2010 19:47:02 +0000 (12:47 -0700)

Trivial merge