From: Pierre-Alexandre Meyer <pierre@mouraf.org>
Date: Sun, 26 Apr 2009 21:35:56 +0000 (-0700)
Subject: Merge branch 'disklib' into for-erwan
X-Git-Tag: syslinux-3.83-pre8~37
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c5868d154656e3832822dd24dd9701fe55eb2a4;p=profile%2Fivi%2Fsyslinux.git

Merge branch 'disklib' into for-erwan

Conflicts:

	com32/hdt/hdt-common.c

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
---

9c5868d154656e3832822dd24dd9701fe55eb2a4