merge with mainline

author BVK Chaitanya <bvk@dbook>

Thu, 26 Aug 2010 06:15:29 +0000 (11:45 +0530)

committer BVK Chaitanya <bvk@dbook>

Thu, 26 Aug 2010 06:15:29 +0000 (11:45 +0530)
author BVK Chaitanya <bvk@dbook>
Thu, 26 Aug 2010 06:15:29 +0000 (11:45 +0530)
committer BVK Chaitanya <bvk@dbook>
Thu, 26 Aug 2010 06:15:29 +0000 (11:45 +0530)
diff --cc grub-core/script/lexer.c
Simple merge
diff --cc grub-core/script/yylex.l
Simple merge
author	BVK Chaitanya <bvk@dbook>
	Thu, 26 Aug 2010 06:15:29 +0000 (11:45 +0530)
committer	BVK Chaitanya <bvk@dbook>
	Thu, 26 Aug 2010 06:15:29 +0000 (11:45 +0530)
		1	2
grub-core/script/lexer.c	patch \|	diff1 \|	diff2 \|	blob \| history
grub-core/script/yylex.l	patch \|	diff1 \|	diff2 \|	blob \| history