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