Merge branch 'master' of git://git.kernel.org/pub/scm/boot/syslinux/syslinux into...
authorErwan Velu <erwan.velu@free.fr>
Thu, 16 Apr 2009 19:32:22 +0000 (21:32 +0200)
committerErwan Velu <erwan.velu@free.fr>
Thu, 16 Apr 2009 19:32:22 +0000 (21:32 +0200)

Trivial merge