Merge branch 'master' of https://vcs.maemo.org/git/dh-make-perl