Merge branch 'softres'

author H. Peter Anvin <hpa@zytor.com>

Tue, 8 Dec 2009 00:23:22 +0000 (16:23 -0800)

committer H. Peter Anvin <hpa@zytor.com>

Tue, 8 Dec 2009 00:23:22 +0000 (16:23 -0800)
author H. Peter Anvin <hpa@zytor.com>
Tue, 8 Dec 2009 00:23:22 +0000 (16:23 -0800)
committer H. Peter Anvin <hpa@zytor.com>
Tue, 8 Dec 2009 00:23:22 +0000 (16:23 -0800)
diff --cc com32/lib/Makefile
Simple merge
diff --cc com32/menu/menu.h
Simple merge
diff --cc com32/menu/menumain.c
Simple merge
diff --cc com32/menu/readconfig.c
Simple merge
author	H. Peter Anvin <hpa@zytor.com>
	Tue, 8 Dec 2009 00:23:22 +0000 (16:23 -0800)
committer	H. Peter Anvin <hpa@zytor.com>
	Tue, 8 Dec 2009 00:23:22 +0000 (16:23 -0800)
		1	2
com32/lib/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
com32/menu/menu.h	patch \|	diff1 \|	diff2 \|	blob \| history
com32/menu/menumain.c	patch \|	diff1 \|	diff2 \|	blob \| history
com32/menu/readconfig.c	patch \|	diff1 \|	diff2 \|	blob \| history