From: H. Peter Anvin <hpa@zytor.com>
Date: Tue, 4 Mar 2008 04:20:09 +0000 (-0800)
Subject: Merge commit 'origin/master' into nolen
X-Git-Tag: syslinux-3.70-pre4^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0469c2d284a4c5265c0856cb4b67ec97b5b3f240;p=profile%2Fivi%2Fsyslinux.git

Merge commit 'origin/master' into nolen

Conflicts:

	version
---

0469c2d284a4c5265c0856cb4b67ec97b5b3f240