K 10
svn:author
V 5
adamw
K 8
svn:date
V 27
2005-04-12T04:22:45.000000Z
K 7
svn:log
V 109
*sigh* This is why even cursory inspections of diffs is a good
idea. Remove the re-added CVS conflict lines.

END