K 10
svn:author
V 5
gavin
K 8
svn:date
V 27
2011-06-20T08:00:32.799894Z
K 7
svn:log
V 124
Merge tnftp-20100108 from the vendor branch into head.

PR:		bin/112288 bin/120256 bin/129014 bin/145528
MFC after:	1 month

END