Merge branch 'master' of git://git.kernel.org/pub/scm/boot/syslinux/syslinux
authorErwan Velu <erwanaliasr1@gmail.com>
Mon, 18 Apr 2011 21:12:22 +0000 (23:12 +0200)
committerErwan Velu <erwanaliasr1@gmail.com>
Mon, 18 Apr 2011 21:12:22 +0000 (23:12 +0200)

Trivial merge