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

merge with mainline
---

a431c98a52cf7b609cb21e12fc99c4da20b71c4d
diff --cc Makefile.util.def
index b811b4101,79541b5ed..a3d5381d4
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@@ -513,12 -513,12 +513,18 @@@ script = 
    common = tests/grub_script_setparams.in;
  };
  
+ script = {
+   testcase;
+   name = grub_script_return;
+   common = tests/grub_script_return.in;
+ };
+ 
 +script = {
 +  testcase;
 +  name = grub_cmd_regexp;
 +  common = tests/grub_cmd_regexp.in;
 +};
 +
  program = {
    testcase;
    name = example_unit_test;