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).
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.

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase