K 10
svn:author
V 3
avg
K 8
svn:date
V 27
2014-01-16T18:01:57.790747Z
K 7
svn:log
V 92
fix a botched merge in r260775, MFC of r258739

This is a direct commit.

Pointyhat to:	avg

END