[FYI] Merge branch 'maint' into master

[Stefano Lattarini]

commit b0f4556918deaf2efa42a298c27f42195e909815
Merge: 26b7855 0610fc8
Author: Stefano Lattarini <stefano.lattar...@gmail.com>
Date:   Sat Oct 27 14:23:40 2012 +0200

    Merge branch 'maint'

    * maint:
      tests: prepare to move ./defs to t/ax/test-init.sh