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