Merge branch 'master' of git.sv.gnu.org:/srv/git/grub

diff --cc ChangeLog
index 966c7773d83c681296b57613da61e4caafb4cf4f,4bc407e18b2d055b00c1c98a15b6e2de653a6e3e..2ce6a9568bc7f44973e3633a37beac22ff529c8b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,19 +1,23 @@@
+ 2013-12-20  Colin Watson  <cjwatson@ubuntu.com>
+ 
+       Be more verbose about some configure failures.
+ 
+ 2013-12-20  Colin Watson  <cjwatson@ubuntu.com>
+ 
+       Fix various build problems on GNU/Hurd.
+ 
+       * grub-core/osdep/unix/getroot.c (strip_extra_slashes): Move inside
+       !defined (__GNU__).
+       (xgetcwd): Likewise.
+       * include/grub/emu/hostdisk.h (grub_util_hurd_get_disk_info)
+       [__GNU__]: Add prototype.
+       * util/getroot.c (grub_util_biosdisk_get_grub_dev) [__GNU__]: Format
+       long int using %ld rather than %d.
+ 
 +2013-12-18  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * util/grub-install.c: Inform user about install platform.
 +
  2013-12-18  Vladimir Serbinenko  <phcoder@gmail.com>
  
        * configure.ac: Set version to 2.02~beta1.