[FYI] Merge branch 'maint' into master

[Stefano Lattarini]

commit 93c2c33e04e4e5b78da45ec8c251899acce5d322
Merge: dd3fb7e bd0d41d
Author: Stefano Lattarini <stefano.lattar...@gmail.com>
Date:   Wed Nov 7 21:51:01 2012 +0100

    Merge branch 'maint'

    * maint:
      tests: new variable $am_testaux_builddir
      tests: rename $am_testauxdir -> $am_testaux_srcdir