From 9e82940496fcacb66bd3a4132fab048eb8e7ea7d Mon Sep 17 00:00:00 2001
From: unknown <bell@sanja.is.com.ua>
Date: Sat, 26 Oct 2002 19:24:20 +0300
Subject: [PATCH] Merge abelkin@work.mysql.com:/home/bk/mysql-4.1 into
 sanja.is.com.ua:/home/bell/mysql/mysql-4.1.bak

BitKeeper/deleted/.del-.del-Makefile.emx~1:
  Delete: BitKeeper/deleted/.del-Makefile.emx~1
BitKeeper/deleted/.del-.del-Makefile.riscos:
  Delete: BitKeeper/deleted/.del-Makefile.riscos