pull-in func-params branch

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

Wed, 19 May 2010 05:34:02 +0000 (11:04 +0530)

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

Wed, 19 May 2010 05:34:02 +0000 (11:04 +0530)
author BVK Chaitanya <bvk.groups@gmail.com>
Wed, 19 May 2010 05:34:02 +0000 (11:04 +0530)
committer BVK Chaitanya <bvk.groups@gmail.com>
Wed, 19 May 2010 05:34:02 +0000 (11:04 +0530)
diff --cc include/grub/script_sh.h
Simple merge
diff --cc script/execute.c
Simple merge
author	BVK Chaitanya <bvk.groups@gmail.com>
	Wed, 19 May 2010 05:34:02 +0000 (11:04 +0530)
committer	BVK Chaitanya <bvk.groups@gmail.com>
	Wed, 19 May 2010 05:34:02 +0000 (11:04 +0530)
		1	2
include/grub/script_sh.h	patch \|	diff1 \|	diff2 \|	blob \| history
script/execute.c	patch \|	diff1 \|	diff2 \|	blob \| history