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