Merge commit 'liu/master' into fsc syslinux-4.00-pre2
authorH. Peter Anvin <hpa@zytor.com>
Tue, 11 Aug 2009 20:20:04 +0000 (13:20 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 11 Aug 2009 20:20:04 +0000 (13:20 -0700)

Trivial merge