Merge from GNU gettext.