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