log tests/test-merge2 @ 1213:db9639b8594c

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