merge with mainline

author BVK Chaitanya <bvk@dbook>

Fri, 20 Aug 2010 19:19:29 +0000 (00:49 +0530)

committer BVK Chaitanya <bvk@dbook>

Fri, 20 Aug 2010 19:19:29 +0000 (00:49 +0530)
author BVK Chaitanya <bvk@dbook>
Fri, 20 Aug 2010 19:19:29 +0000 (00:49 +0530)
committer BVK Chaitanya <bvk@dbook>
Fri, 20 Aug 2010 19:19:29 +0000 (00:49 +0530)
diff --cc Makefile.in
Simple merge
diff --cc configure.ac
Simple merge
diff --cc include/grub/emu/misc.h
Simple merge
diff --cc include/grub/misc.h
Simple merge
diff --cc normal/main.c
Simple merge
diff --cc util/misc.c
Simple merge
author	BVK Chaitanya <bvk@dbook>
	Fri, 20 Aug 2010 19:19:29 +0000 (00:49 +0530)
committer	BVK Chaitanya <bvk@dbook>
	Fri, 20 Aug 2010 19:19:29 +0000 (00:49 +0530)
		1	2
Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
include/grub/emu/misc.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/grub/misc.h	patch \|	diff1 \|	diff2 \|	blob \| history
normal/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
util/misc.c	patch \|	diff1 \|	diff2 \|	blob \| history