From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sun, 18 Jul 2010 15:53:58 +0000 (+0530)
Subject: merge with mainline
X-Git-Tag: 1.99~600^2~13^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f745095a3726bdb39b1ef3048258c043b40d1415;p=thirdparty%2Fgrub.git

merge with mainline
---

f745095a3726bdb39b1ef3048258c043b40d1415
diff --cc script/parser.y
index e5de35cf4,e85ba624d..672d9dc88
--- a/script/parser.y
+++ b/script/parser.y
@@@ -20,6 -20,6 +20,7 @@@
  %{
  #include <grub/script_sh.h>
  #include <grub/mm.h>
++#include <grub/misc.h>
  
  #define YYFREE          grub_free
  #define YYMALLOC        grub_malloc