Merge remote

diff --cc ChangeLog
index e9b054d0c472d9bd90496a49e9cd7350a8baf78c,243a92c4d35fa8fcefd4f3a7a6cecd8dff9be2a2..79978d3070cca848ea178dd8ea465cebae633ea1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,10 +1,16 @@@
+ 2009-11-21  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+ 
+       * util/getroot.c [__GNU__]: Include <hurd.h>, <hurd/lookup.h>, and
+       <hurd/fs.h>
+       [__GNU__] (grub_guess_root_device): Call file_name_lookup and
+       file_get_storage_info to implement grub_guess_root_device.
+ 
 +2009-11-21  Felix Zielcke  <fzielcke@z-51.de>
 +
 +      * Makefile.in (target): Use make's builtin $(shell) function
 +      instead of calling directly $(SHELL) to create the locale directories,
 +      inside the $(foreach) function.
 +
  2009-11-21  Felix Zielcke  <fzielcke@z-51.de>
  
        * util/grub-mkrescue.in: Print an error and usage if output option