merge with emu-reorg

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

Thu, 6 May 2010 07:36:51 +0000 (13:06 +0530)

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

Thu, 6 May 2010 07:36:51 +0000 (13:06 +0530)
author BVK Chaitanya <bvk.groups@gmail.com>
Thu, 6 May 2010 07:36:51 +0000 (13:06 +0530)
committer BVK Chaitanya <bvk.groups@gmail.com>
Thu, 6 May 2010 07:36:51 +0000 (13:06 +0530)
diff --cc conf/any-emu.rmk
Simple merge
diff --cc include/grub/emu/misc.h
Simple merge
diff --cc util/misc.c
Simple merge
author	BVK Chaitanya <bvk.groups@gmail.com>
	Thu, 6 May 2010 07:36:51 +0000 (13:06 +0530)
committer	BVK Chaitanya <bvk.groups@gmail.com>
	Thu, 6 May 2010 07:36:51 +0000 (13:06 +0530)
		1	2
conf/any-emu.rmk	patch \|	diff1 \|	diff2 \|	blob \| history
include/grub/emu/misc.h	patch \|	diff1 \|	diff2 \|	blob \| history
util/misc.c	patch \|	diff1 \|	diff2 \|	blob \| history