K 10
svn:author
V 3
avg
K 8
svn:date
V 27
2010-08-22T08:18:32.270129Z
K 7
svn:log
V 105
Fix a mismerge in r211581, MFC of r210427

This is a direct commit.

Reported by:	many
Pointyhat to:	avg

END