K 10
svn:author
V 6
adrian
K 8
svn:date
V 27
2011-10-26T03:25:25.451320Z
K 7
svn:log
V 101
Undo my very broken set of merges. I'll do some more updating and
then try my hand at another merge.

END