5002 Possible buffer overflow in makefh3()
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Robert Mustacchi <rm@joyent.com>
2964 need POSIX 2008 locale object support (more C++ fixes)
Merge branch 'upstream'