Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml
authorMarcin Kaźmierczak <marcin@marcin-desktop.(none)>
Tue, 1 Feb 2011 13:52:49 +0000 (14:52 +0100)
committerMarcin Kaźmierczak <marcin@marcin-desktop.(none)>
Tue, 1 Feb 2011 13:52:49 +0000 (14:52 +0100)

Trivial merge