Merge from trunk

This commit is contained in:
Robert Millan 2009-12-25 22:29:47 +00:00
commit d94000ed13
210 changed files with 4949 additions and 2557 deletions

View file

@ -179,7 +179,7 @@ malloc_hook (void)
if (! hooktarget)
{
slots_available = 0;
return grub_error (GRUB_ERR_OUT_OF_MEMORY, "No space for mmap hook");
return grub_error (GRUB_ERR_OUT_OF_MEMORY, "no space for mmap hook");
}
return GRUB_ERR_NONE;
}