@@ -, +, @@ 
--- /var/tmp/portage/grub-0.95.20040823/work/grub-0.95.20040823/./stage2/shared.h       Tue Feb  8 12:25:53 2005
--- 871,877 ----
  int grub_tolower (int c);
  int grub_isspace (int c);
  int grub_strncat (char *s1, const char *s2, int n);
+ void grub_memcpy(void *dest, const void *src, int len);
  void *grub_memmove (void *to, const void *from, int len);
  void *grub_memset (void *start, int c, int len);
  int grub_strncat (char *s1, const char *s2, int n);
  int nul_terminate (char *str);
  int get_based_digit (int c, int base);
  int safe_parse_maxint (char **str_ptr, int *myint_ptr);
  void grub_putstr (const char *str);
  #ifndef NO_DECOMPRESSION
--- 912,918 ----
  int nul_terminate (char *str);
  int get_based_digit (int c, int base);
  int safe_parse_maxint (char **str_ptr, int *myint_ptr);
  void grub_putstr (const char *str);
  #ifndef NO_DECOMPRESSION
--- /var/tmp/portage/grub-0.95.20040823/work/grub-0.95.20040823/./stage2/char_io.c      Tue Feb  8 12:25:35 2005
  #endif /* ! STAGE1_5 */
  int
  {
  #ifdef GRUB_UTIL
      {
        int ret;
  # if defined(HAVE_START_SYMBOL)
--- 1203,1212 ----
  #endif /* ! STAGE1_5 */
  int
  {
  #ifdef GRUB_UTIL
      {
        int ret;
  # if defined(HAVE_START_SYMBOL)
        return ret;
      }
      {
        int ret;
  # if defined(HAVE_END_SYMBOL)
--- 1217,1223 ----
        return ret;
      }
      {
        int ret;
  # if defined(HAVE_END_SYMBOL)