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

Trivial merge