merge mainline into jail

diff --cc grub-core/commands/menuentry.c
Simple merge

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

diff --cc include/grub/normal.h
index 7c99951c63bcb99bcc6222b2cf3526f498babe88,a3827f584ee958e15ee5f7898a1972ed4fb9df3e..390dbb1da1effcb4870ac0598fcccbf5c6a8d085
--- 1/include/grub/normal.h
--- 2/include/grub/normal.h
+++ b/include/grub/normal.h
@@@ -115,6 -114,15 +114,17 @@@ void grub_normal_reset_more (void)
  
  void grub_xputs_normal (const char *str);
  
 +extern int grub_jail_level;
 +
+ grub_err_t
+ grub_normal_add_menu_entry (int argc, const char **args, char **classes,
+                           const char *users, const char *hotkey,
+                           const char *prefix, const char *sourcecode);
+ 
+ grub_err_t
+ grub_normal_set_password (const char *user, const char *password);
+ 
+ void grub_normal_auth_init (void);
+ void grub_normal_auth_fini (void);
+ 
  #endif /* ! GRUB_NORMAL_HEADER */