sync with trunk

diff --cc ChangeLog
index c000b38d60c34405be9d0a80b6c05e2b5df7e264,d40f765a7261bd2e5e4c04440c9f5fcfc020417b..4e30a39a87f6d97181a726cbe0a53daf67e79416
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,18 +1,23 @@@
 +2010-01-28  BVK Chaitanya  <bvk.groups@gmail.com>
 +
 +      * include/grub/script_sh.h (sourcecode): Add const qualifier.
 +      * util/grub-script-check.c (getline): Fix empty lines case.
 +
+ 2010-01-28  Robert Millan  <rmh.grub@aybabtu.com>
+ 
+       * Makefile.in (check): Exit with fail status when one of the tests
+       fails.
+       * tests/example_functional_test.c (example_test): Fix reversed assert.
+       * tests/example_unit_test.c (example_test): Likewise.
+ 
+ 2010-01-28  Colin Watson  <cjwatson@ubuntu.com>
+ 
+       * util/grub.d/10_linux.in: This script does not use any of the
+       contents of gettext.sh, only the external command `gettext', so stop
+       sourcing it.  (Moreover, gettext.sh isn't necessarily installed in
+       the same prefix as GRUB.)
+       * util/grub.d/10_kfreebsd.in: Likewise.
+ 
  2010-01-27  Vladimir Serbinenko  <phcoder@gmail.com>
  
        * normal/cmdline.c (grub_cmdline_get): Fix completion in the middle