log tests/test-merge2 @ 1338:2b77ea66fe70

age author description
Sat, 30 Jul 2005 09:00:14 -0800 mpm Merge with BOS