Partially merge -c31661 ^/trunk/SHERPA .
Relevant part of the original message: Fix compilation for GNU makeinfo 5.2