K 10
svn:author
V 6
marius
K 8
svn:date
V 27
2010-05-18T17:09:22.279762Z
K 7
svn:log
V 114
MFC: r208117

Fix a mismerge in r206001 (MFC'ed to stable/7 in r208105).

PR:		146614
Approved by:	jfv (implicit)

END