merge with mainline

author BVK Chaitanya <bvk@dbook>

Thu, 12 Aug 2010 04:00:26 +0000 (09:30 +0530)

committer BVK Chaitanya <bvk@dbook>

Thu, 12 Aug 2010 04:00:26 +0000 (09:30 +0530)
author BVK Chaitanya <bvk@dbook>
Thu, 12 Aug 2010 04:00:26 +0000 (09:30 +0530)
committer BVK Chaitanya <bvk@dbook>
Thu, 12 Aug 2010 04:00:26 +0000 (09:30 +0530)
diff --cc include/grub/misc.h
Simple merge
diff --cc script/execute.c
Simple merge
author	BVK Chaitanya <bvk@dbook>
	Thu, 12 Aug 2010 04:00:26 +0000 (09:30 +0530)
committer	BVK Chaitanya <bvk@dbook>
	Thu, 12 Aug 2010 04:00:26 +0000 (09:30 +0530)
		1	2
include/grub/misc.h	patch \|	diff1 \|	diff2 \|	blob \| history
script/execute.c	patch \|	diff1 \|	diff2 \|	blob \| history