Received: (from majordom@localhost)
	by hyperreal.com (8.8.5/8.8.5) id SAA00922;
	Sat, 7 Jun 1997 18:45:05 -0700 (PDT)
Received: from scanner.worldgate.com (scanner.worldgate.com [198.161.84.3])
	by hyperreal.com (8.8.5/8.8.5) with ESMTP id SAA00916
	for <new-httpd@hyperreal.com>; Sat, 7 Jun 1997 18:45:01 -0700 (PDT)
Received: from znep.com (uucp@localhost)
	by scanner.worldgate.com (8.8.5/8.8.5) with UUCP id TAA15428
	for new-httpd@hyperreal.com; Sat, 7 Jun 1997 19:44:59 -0600 (MDT)
Received: from localhost (marcs@localhost) by alive.znep.com (8.7.5/8.7.3)
 with SMTP id TAA27093 for <new-httpd@hyperreal.com>;
 Sat, 7 Jun 1997 19:45:55 -0600 (MDT)
Date: Sat, 7 Jun 1997 19:45:54 -0600 (MDT)
From: Marc Slemko <marcs@znep.com>
To: new-httpd@hyperreal.com
Subject: branched tree
Message-ID: <Pine.BSF.3.95.970607194447.27088A-100000@alive.znep.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: new-httpd-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

If we have some agreement that the way things have branched is fine and
that most changes should be carried back to the 1.2 tree, I will start by
merging the changes that have been made to the main branch into the 1.2
branch.