Merge from trunk.

author Robert Millan <rmh@aybabtu.com>

Wed, 25 Nov 2009 21:34:53 +0000 (21:34 +0000)

committer Robert Millan <rmh@aybabtu.com>

Wed, 25 Nov 2009 21:34:53 +0000 (21:34 +0000)
author Robert Millan <rmh@aybabtu.com>
Wed, 25 Nov 2009 21:34:53 +0000 (21:34 +0000)
committer Robert Millan <rmh@aybabtu.com>
Wed, 25 Nov 2009 21:34:53 +0000 (21:34 +0000)
diff --cc Makefile.in
Simple merge
diff --cc conf/common.rmk
Simple merge
diff --cc configure.ac
Simple merge
diff --cc include/grub/misc.h
Simple merge
diff --cc kern/misc.c
Simple merge
diff --cc normal/main.c
Simple merge
diff --cc util/grub-mkconfig_lib.in
Simple merge
author	Robert Millan <rmh@aybabtu.com>
	Wed, 25 Nov 2009 21:34:53 +0000 (21:34 +0000)
committer	Robert Millan <rmh@aybabtu.com>
	Wed, 25 Nov 2009 21:34:53 +0000 (21:34 +0000)
		1	2
Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
conf/common.rmk	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
include/grub/misc.h	patch \|	diff1 \|	diff2 \|	blob \| history
kern/misc.c	patch \|	diff1 \|	diff2 \|	blob \| history
normal/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
util/grub-mkconfig_lib.in	patch \|	diff1 \|	diff2 \|	blob \| history