Merge branch 'master' of git://git.zytor.com/syslinux/syslinux
authorErwan Velu <erwanaliasr1@gmail.com>
Tue, 29 May 2012 19:45:47 +0000 (21:45 +0200)
committerErwan Velu <erwanaliasr1@gmail.com>
Tue, 29 May 2012 19:45:47 +0000 (21:45 +0200)

Trivial merge