K 10
svn:author
V 6
gerald
K 8
svn:date
V 27
2015-04-10T19:24:48.710474Z
K 7
svn:log
V 177
Unbreak the build.  This patch is slightly different than one that
got applied upstream earlier today, but equivalent.  With the next
release we'll be able to simply remove it.

END