Merge branch 'core32' of git://git.zytor.com/syslinux/syslinux into core32
authorLiu Aleaxander <Aleaxander@gmail.com>
Tue, 2 Jun 2009 23:18:15 +0000 (07:18 +0800)
committerLiu Aleaxander <Aleaxander@gmail.com>
Tue, 2 Jun 2009 23:18:15 +0000 (07:18 +0800)
commit1d7733675c3c265ba00094647d4910b0f5d8748d
treeef3c6cc52e5ae66fbdbbdc64970670ba58a886f0
parentd0ce3937b75d491777e2c1f57ba0eaa20176b9f3
parentd19a7c6a6989f19c4f82212a9a7b654bdf289739
Merge branch 'core32' of git://git.zytor.com/syslinux/syslinux into core32

Conflicts:

core/hello.c
core/include/core.h
core/layout.inc
core/hello.c
core/include/core.h