Attached is a revised update, which contains the
entire patch.  Since recent gnulib changes have
been merged, the new patch is smaller.