Merge https://git.maemo.org/projects/gonvert