Merge commit 'origin/master' into nolen syslinux-3.70-pre4
authorH. Peter Anvin <hpa@zytor.com>
Tue, 4 Mar 2008 04:20:09 +0000 (20:20 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 4 Mar 2008 04:20:09 +0000 (20:20 -0800)
Conflicts:

version


Trivial merge