merge mainline into emu-mod

ChangeLog

@@ -1,3 +1,13 @@
+2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/multiboot2.h: Remove leftover file.
+	* include/grub/normal.h [GRUB_UTIL]: Remove leftover declarations.
+	* include/grub/partition.h [GRUB_UTIL]: Likewise.
+
+2010-02-07  Yves Blusseau  <blusseau@zetam.org>
+
+	* gnulib/getdelim.c: add missing header (type ssize_t must be defined).
+
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Fix warnings in grub-emu when compiling with maximum warning options.

gnulib/getdelim.c

@@ -27,6 +27,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <unistd.h>
 
 #ifndef SSIZE_MAX
 # define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))