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

Trivial merge