Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml
authorMarcin Kaźmierczak <marcin@marcin-desktop.(none)>
Tue, 14 Dec 2010 11:20:15 +0000 (12:20 +0100)
committerMarcin Kaźmierczak <marcin@marcin-desktop.(none)>
Tue, 14 Dec 2010 11:20:15 +0000 (12:20 +0100)

Trivial merge