merge trunk

diff --cc grub-core/partmap/msdos.c
index c6340a2311effeadba996dd37d4ec0c156cf4c34,31a0a0707642a4d4c2fd82b39a4ddc1d7a2f9ff2..acfa6f302810d5a21087b5a898bbda0f85341c9a
--- 1/grub-core/partmap/msdos.c
--- 2/grub-core/partmap/msdos.c
+++ b/grub-core/partmap/msdos.c
@@@ -271,14 -232,10 +271,14 @@@ pc_partition_map_embed (struct grub_dis
        break;
      }
  
-   if (end >= *nsectors + 1)
+   if (end >= *nsectors + 2)
      {
-       int i, j;
 -      unsigned i;
++      unsigned i, j;
 +      char *embed_signature_check;
 +      unsigned int orig_nsectors;
 +
 +      orig_nsectors = *nsectors;
-       *nsectors = end - 1;
+       *nsectors = end - 2;
        *sectors = grub_malloc (*nsectors * sizeof (**sectors));
        if (!*sectors)
        return grub_errno;

diff --cc util/grub-setup.c
Simple merge