Merge branch 'http' of ssh://drop.maemo.org/git/mdictionary into http