Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary into qml
authorMarcin Kaźmierczak <marcin@marcin-desktop.(none)>
Wed, 16 Feb 2011 15:00:13 +0000 (16:00 +0100)
committerMarcin Kaźmierczak <marcin@marcin-desktop.(none)>
Wed, 16 Feb 2011 15:00:13 +0000 (16:00 +0100)

Trivial merge