K 10
svn:author
V 7
rwatson
K 8
svn:date
V 27
2011-06-05T10:07:12.874124Z
K 7
svn:log
V 195
Correct a last minute merge error for new M_HASHTYPE macros.  This didn't
turn up as a build problem because the macros aren't used (yet).

MFC after:	3 days
Sponsored by:	Juniper Networks, Inc.

END