From: BVK Chaitanya <bvk@dbook>
Date: Sat, 4 Sep 2010 09:11:08 +0000 (+0530)
Subject: merge with mainline
X-Git-Tag: 1.99~597^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd652829a13e0d91e9eca784e6508d1d22eecf13;p=thirdparty%2Fgrub.git

merge with mainline
---

cd652829a13e0d91e9eca784e6508d1d22eecf13
diff --cc Makefile.util.def
index 5f2295c3e,6dfd9301d..a0ab3d3d9
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@@ -501,12 -501,12 +501,18 @@@ script = 
    common = tests/grub_script_shift.in;
  };
  
+ script = {
+   testcase;
+   name = grub_script_blockarg;
+   common = tests/grub_script_blockarg.in;
+ };
+ 
 +script = {
 +  testcase;
 +  name = grub_script_return;
 +  common = tests/grub_script_return.in;
 +};
 +
  program = {
    testcase;
    name = example_unit_test;