merge with mainline

diff --cc commands/help.c
Simple merge

diff --cc include/grub/command.h
Simple merge

diff --cc include/grub/script_sh.h
index 2ada5d4744ec71eedca686291182258a61c39c31,9bfc7e4bbc5ac9b75b58b360a23ebed1de30d14f..6471c7de3ea2e2de2feea86bd2c5ff6df020ca5d
--- 1/include/grub/script_sh.h
--- 2/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@@ -350,27 -345,14 +355,29 @@@ grub_script_function_t grub_script_func
                                                    struct grub_script *cmd);
  void grub_script_function_remove (const char *name);
  grub_script_function_t grub_script_function_find (char *functionname);
- int grub_script_function_iterate (int (*iterate) (grub_script_function_t));
 -
  grub_err_t grub_script_function_call (grub_script_function_t func,
                                      int argc, char **args);
  
  char **
  grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *count);
  
+ grub_err_t
+ grub_normal_parse_line (char *line, grub_reader_getline_t getline);
+ 
 +static inline struct grub_script *
 +grub_script_get (struct grub_script *script)
 +{
 +  script->refcnt++;
 +  return script;
 +}
 +
 +static inline void
 +grub_script_put (struct grub_script *script)
 +{
 +  if (script->refcnt == 0)
 +    grub_script_free (script);
 +  else
 +    script->refcnt--;
 +}
 +
  #endif /* ! GRUB_NORMAL_PARSER_HEADER */

diff --cc script/parser.y
index 1202fef2972b3bb54bba3bf8c6fc4c26a197ae66,cc08af37a9ed4ec3f9e061a7b1ef52b8b8d31cb0..e32ba3cece75fdcc5fcdea8639b6b6a2f80f9747
--- 1/script/parser.y
--- 2/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

diff --cc tests/lib/functional_test.c
Simple merge