[FYI] Merge last 'maint' patch into master

[Stefano Lattarini]

commit 15b8b62ac20add6de8954053335487a7a492a462
Merge: cbd1a60 ea93d8d
Author: Stefano Lattarini <stefano.lattar...@gmail.com>
Date:   Sat Jul 7 12:55:29 2012 +0200

    Merge branch 'maint'

    * maint:
      tests: move 'runtest' into the top-level directory