CVS commit: src

[Paul Kranenburg <pk%netbsd.org@localhost>]

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.