K 10
svn:author
V 3
dim
K 8
svn:date
V 27
2014-11-26T14:36:04.107804Z
K 7
svn:log
V 268
After some horrible wrestling with Subversion's worthless merge
implementation, merge ^/head r275078 through r275117.

Note that all the extraneous mergeinfo is there because Subversion
created it.  I'll hopefully be able to remove it again when merging back
to head.

END