Merge branch 'master' of git://git.kernel.org/pub/scm/boot/syslinux/syslinux
authorErwan Velu <erwan.velu@free.fr>
Tue, 17 Mar 2009 19:10:48 +0000 (20:10 +0100)
committerErwan Velu <erwan.velu@free.fr>
Tue, 17 Mar 2009 19:10:48 +0000 (20:10 +0100)

Trivial merge