[FYI] Merge branch 'maint' into master

[Stefano Lattarini]

commit adb834ebf078a00ed67ebc325c692452e6e5dcf6
Merge: 68075ce 3726740
Author: Stefano Lattarini <stefano.lattar...@gmail.com>
Date:   Sun May 6 11:04:45 2012 +0200

    Merge branch 'maint'

    * maint:
      m4: prepend m4 builtins with "m4_"
      docs: fix clumsy grammar in the scripts-based testsuite chapter

    Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com>