[BZ #470] Import fix from gnulib.