From: Holger Lubitz <hal@duncan.ol.sub.de>
Date: Thu, 23 Aug 2007 21:15:54 +0000 (+0200)
Subject: Merge branch 'master' into curses
X-Git-Tag: v0.9.3~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d6f6fb9243aca7f62f85919519a584836302c99;p=thirdparty%2Fipxe.git

Merge branch 'master' into curses

Conflicts:

	src/include/compiler.h
	src/include/readline/readline.h

created by strings branch merge. resolved.
---

5d6f6fb9243aca7f62f85919519a584836302c99