K 10
svn:author
V 6
emaste
K 8
svn:date
V 27
2013-11-21T22:17:55.989005Z
K 7
svn:log
V 101
Merge r258431 from HEAD

(Merged individually due to conflict)

Sponsored by:	The FreeBSD Foundation

END