Subject: CVS commit: src
To: None <source-changes@netbsd.org>
From: Paul Kranenburg <pk@netbsd.org>
List: source-changes
Date: 04/12/1999 14:31:34 
Module Name:	src
Committed By:	pk
Date:		Mon Apr 12 21:31:34 UTC 1999

Modified Files:
	src/sys/arch/arm32/arm32 [netbsd-1-4]: db_trace.c
Log Message:
Fix conflicts introduced by a stray cvs merge op.