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