[FYI] Merge branch 'maint' into master

[Stefano Lattarini]

commit 5d99776ce05b7a954ccf30d7ed666494c0db4e91
Merge: 60a6937 0732160
Author: Stefano Lattarini <stefano.lattar...@gmail.com>
Date:   Thu Jun 28 18:38:02 2012 +0200

    Merge branch 'maint'

    * maint:
      tests init: don't bother allowing '$me' to be overridable
      tests init: typofixes in comments

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