merge with mainline

author BVK Chaitanya <bvk.groups@gmail.com>

Wed, 2 Jun 2010 03:42:52 +0000 (09:12 +0530)

committer BVK Chaitanya <bvk.groups@gmail.com>

Wed, 2 Jun 2010 03:42:52 +0000 (09:12 +0530)
author BVK Chaitanya <bvk.groups@gmail.com>
Wed, 2 Jun 2010 03:42:52 +0000 (09:12 +0530)
committer BVK Chaitanya <bvk.groups@gmail.com>
Wed, 2 Jun 2010 03:42:52 +0000 (09:12 +0530)
diff --cc configure.ac
Simple merge
diff --cc include/grub/emu/misc.h
Simple merge
diff --cc normal/main.c
Simple merge
author	BVK Chaitanya <bvk.groups@gmail.com>
	Wed, 2 Jun 2010 03:42:52 +0000 (09:12 +0530)
committer	BVK Chaitanya <bvk.groups@gmail.com>
	Wed, 2 Jun 2010 03:42:52 +0000 (09:12 +0530)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
include/grub/emu/misc.h	patch \|	diff1 \|	diff2 \|	blob \| history
normal/main.c	patch \|	diff1 \|	diff2 \|	blob \| history