log tests/test-merge1.out @ 422:10c43444a38e

age author description
Tue, 21 Jun 2005 18:41:57 -0800 mpm [PATCH] Merging identical changes from another branch