Merge 1535.

Sync with ports, fix build when NLS is unset.


git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/experimental@1536 058c260c-8361-11dd-a0ac-aa2bafec7d09