K 10
svn:author
V 3
dfr
K 8
svn:date
V 27
2008-05-20T07:55:03.000000Z
K 7
svn:log
V 46
Fix a harmless mismerge.

Pointed out by: jhb

END