K 10
svn:author
V 3
cem
K 8
svn:date
V 27
2016-02-03T01:40:07.975604Z
K 7
svn:log
V 158
Revert r295167 at bdrewery's request

$ svn merge -c -295167 .

JHB reports Navdeep reports that it breaks distribution and etcupdate.

Approved by:	bdrewery

END