Merge https://vcs.maemo.org/git/masstransit