Merge trunk

diff --cc ChangeLog
index 345ea8ae2ecbe3e5983655171b06e75694cdbbb4,42ab8b8b62f269c8eac257b35832e7e2ccead682..868fd5c1358a42ed19649b0753119e3243c04e01
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,20 +1,26 @@@
 +2009-11-21  Felix Zielcke  <fzielcke@z-51.de>
 +
 +      Patch from Loïc Minier <loic.minier@ubuntu.com>.
 +      * util/grub.d/30_os-prober.in: Cope with Linux entries where
 +      root and /boot are on different devices.
 +
+ 2009-11-21  Robert Millan  <rmh.grub@aybabtu.com>
+ 
+       Fix build for srcdir != objdir.
+ 
+       * Makefile.in (po/$(PACKAGE).pot): Rename to ...
+       ($(srcdir)/po/$(PACKAGE).pot): ... this.  Run $(XGETTEXT) from
+       $(srcdir).
+       ($(foreach lang, $(LINGUAS), po/$(lang).po)): Rename to ...
+       ($(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po): ... this. Use $^
+       reference for input.
+ 
+ 2009-11-21  Robert Millan  <rmh.grub@aybabtu.com>
+ 
+       * util/grub-mkrescue.in: Use source directory direcly (without copiing
+       or hardlinking it).  Remove -J option, Joliet is not compatible with
+       multiple source directories.
+ 
  2009-11-21  Carles Pina i Estany <carles@pina.cat>
  2009-11-21  Robert Millan  <rmh.grub@aybabtu.com>