merge maint into master

[Akim Demaille]

I find it disturbing that git describe still
sees master as deriving from 2.4, so I installed
the following patch.  It also resulted in maint
not accept %require "2.5" since it sees itself as
a 2.4.

Besides, I am now less happy with the double-patch system,
I would prefer to see fixes installed in maint, and then
merge maint occasionally into master, this is seems more
tractable to me.  I practiced this elsewhere, and it's really
nice.

This is simply

        git merge -s ours origin/maint

commit 70986d84bc674b0fbd9a4dcf5ee192e2cec364bf
Merge: 62243aa 84c1cdc
Author: Akim Demaille <address@hidden>
Date:   Mon Mar 19 11:35:46 2012 +0100

    Merge remote-tracking branch 'fsf/maint'
    
    * fsf/maint: (404 commits)
      doc: update the --verbose report format.
      doc: spell check.
      doc: stmt, not stmnt.
      doc: save width.
      doc: reformat grammar snippets.
      doc: use only @example, not @smallexample.
      doc: style changes.
      doc: minor fixes to "Understanding" section
      tests: minor fixes/simplifications
      tests: be robust to quote style.
      maint: update gnulib.
      tests: be robust to POSIXLY_CORRECT being defined.
      doc: fix environment issues.
      regen.
      tests: fix regressions.
      glr: fix ambiguity reports.
      doc: stylistic improvements.
      maint: address sc_prohibit_doubled_word.
      maint: address sc_prohibit_always-defined_macros.
      maint: address sc_bindtextdomain, sc_program_name and 
sc_prohibit_HAVE_MBRTOWC.
      ...