Merge branch 'master' of git://git.kernel.org/pub/scm/boot/syslinux/syslinux into...
authorerwan <erwan@r1.paris>
Wed, 19 Aug 2009 21:50:50 +0000 (23:50 +0200)
committererwan <erwan@r1.paris>
Wed, 19 Aug 2009 21:50:50 +0000 (23:50 +0200)

Trivial merge