Merge branch 'google' of ssh://drop.maemo.org/git/mdictionary into google
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Mon, 30 Aug 2010 11:33:57 +0000 (13:33 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Mon, 30 Aug 2010 11:33:57 +0000 (13:33 +0200)

Trivial merge