Merge eel.(none):/home/jonas/src/mysql-4.1

into  eel.(none):/home/jonas/src/mysql-4.1-push

BitKeeper/etc/config

@@ -70,5 +70,6 @@ hours:
 [serg:]checkout:get
 [arjen:]checkout:get
 [nick:]checkout:get
+[jonas:]checkout:get
 checkout:edit
 eoln:unix

ndb/src/kernel/Makefile.am

@@ -23,7 +23,6 @@ INCLUDES += \
               -Iblocks/backup \
               -Iblocks/dbutil \
               -Iblocks/suma \
-              -Iblocks/grep \
               -Iblocks/dbtux
 
 LDADD +=  \
@@ -41,7 +40,6 @@ LDADD +=  \
               blocks/backup/libbackup.a \
               blocks/dbutil/libdbutil.a \
               blocks/suma/libsuma.a \
-              blocks/grep/libgrep.a \
               blocks/dbtux/libdbtux.a \
               vm/libkernel.a	\
               error/liberror.a \