Merge grub-file into mainline

diff --cc ChangeLog
index 8fd3eb176f3b25f07646f6333bfe64f94e029e86,8fd3eb176f3b25f07646f6333bfe64f94e029e86..c67e024ba5df17bfa32b6e230619e1a416a475c3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,3 +1,16 @@@
++2010-03-26  Vladimir Serbinenko  <phcoder@gmail.com>
++
++      Don't use __FILE__.
++
++      * genmk.rb: Add -DGRUB_FILE to all C targets.
++      * fs/reiserfs.c: Replace __FILE__ with GRUB_FILE.
++      * include/grub/list.h: Likewise.
++      * include/grub/misc.h: Likewise.
++      * include/grub/mm.h: Likewise.
++      * include/grub/test.h: Likewise.
++      * kern/mm.c: Likewise.
++      * lib/libgcrypt_wrap/cipher_wrap.h: Likewise.
++
  2010-03-26  Vladimir Serbinenko  <phcoder@gmail.com>
  
        Sunpc partitions support.