Use the version from gettext-0.10.40, not CVS.