Merge branch 'pathbased' of ssh://terminus.zytor.com/pub/git/syslinux/syslinux into...
authorH. Peter Anvin <hpa@zytor.com>
Tue, 15 Jun 2010 00:34:24 +0000 (17:34 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 15 Jun 2010 00:34:24 +0000 (17:34 -0700)

Trivial merge