[FYI] Merge branch 'maint' into master

[Stefano Lattarini]

commit 89fdcc96d4f0444a55fc217350c56563efa55a0f
Merge: 50d986f db9b02e
Author: Stefano Lattarini <stefano.lattar...@gmail.com>
Date:   Sun May 19 22:18:54 2013 +0200

    Merge branch 'maint'

    * maint:
      tests: fix a spurious failure on NetBSD 5.1
      texi: build version.texi and stamp-vti in srcdir
      tests: fix a botched heading comment
      tests: fix another spurious with FreeBSD make
      tests: fix a spurious failure with FreeBSD make