K 10
svn:author
V 4
kris
K 8
svn:date
V 27
2000-11-13T02:20:29.000000Z
K 7
svn:log
V 86
Resolve conflicts, and garbage collect some local changes that are no
longer required

END