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

Trivial merge