K 10
svn:author
V 8
jmallett
K 8
svn:date
V 27
2010-06-19T10:06:46.539441Z
K 7
svn:log
V 77
Merge from head, mostly pick up jchandra's merging of things from my branch.

END