Merge branch 'master' of https://vcs.maemo.org/git/marble
drwxr-xr-x - packaging
drwxr-xr-x - www