log hgmerge @ 836:1fe3b14c7044

age author description
Thu, 04 Aug 2005 13:27:41 -0800 mpm Merge with TAH
Thu, 04 Aug 2005 17:43:05 +0100 Thomas Arendsen Hein Cleaned up trap handling: