K 10
svn:author
V 6
eadler
K 8
svn:date
V 27
2014-05-26T21:01:24.177109Z
K 7
svn:log
V 61
Undo my poor merge conflict editing.

Reported by:	rene, mat

END