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