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