Merge branch 'master' of git://git.kernel.org/pub/scm/boot/syslinux/syslinux into...
authorErwan Velu <erwanaliasr1@gmail.com>
Tue, 22 Jun 2010 19:32:27 +0000 (21:32 +0200)
committerErwan Velu <erwanaliasr1@gmail.com>
Tue, 22 Jun 2010 19:32:27 +0000 (21:32 +0200)

Trivial merge