[FYI] Merge branch 'maint' into master

[Stefano Lattarini]

commit 65fa753d961bcecb066fa4c3fca8e1d979868981
Merge: f72b86a 9bd06c8
Author: Stefano Lattarini <stefano.lattar...@gmail.com>
Date:   Fri Dec 28 22:51:33 2012 +0100

    Merge branch 'maint'

    * maint:
      maint: delete '$scriptversion' from all our scripts

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