Merge branch 'master' of ssh://terminus.zytor.com/pub/git/syslinux/syslinux
authorH. Peter Anvin <hpa@zytor.com>
Sat, 14 Nov 2009 03:18:57 +0000 (19:18 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Sat, 14 Nov 2009 03:18:57 +0000 (19:18 -0800)

Trivial merge