Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml
authorMarcin Kaźmierczak <marcin@marcin-desktop.(none)>
Thu, 30 Dec 2010 12:16:55 +0000 (13:16 +0100)
committerMarcin Kaźmierczak <marcin@marcin-desktop.(none)>
Thu, 30 Dec 2010 12:16:55 +0000 (13:16 +0100)

Trivial merge