[FYI] Merge branch 'maint' into master

[Stefano Lattarini]

commit 57f5a614203a2bc62b0640d2296ed3c9de12958f
Merge: 9465eb2 3a71495
Author: Stefano Lattarini <stefano.lattar...@gmail.com>
Date:   Sun Jun 24 10:12:43 2012 +0200

    Merge branch 'maint'

    * maint:
      tests: fix automatic re-execution of tests with Zsh
      tests: drop support for older Zsh shells
      tests: allow AM_TEST_RUNNER_SHELL to be overridden
      tests: fix setup for older Zsh

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