[FYI] Merge branch 'maint' into master

[Stefano Lattarini]

commit 488de31efa525d864ad56cd023f3b33c83101088
Merge: 7c6310c d0dc448
Author: Stefano Lattarini <stefano.lattar...@gmail.com>
Date:   Thu Jun 21 13:15:05 2012 +0200

    Merge branch 'maint'

    * maint:
      docs: avoid failures with development version of Texinfo (4.13.90)
      typofix: s/test derivers/test drivers/ in check.am comments
      typofix: s/env/even/ in comments in GNUmakefile