Merge branch 'master' of https://vcs.maemo.org/git/navit-package into maemo