Merge branch 'google' of ssh://drop.maemo.org/git/mdictionary into google
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Thu, 26 Aug 2010 12:50:52 +0000 (14:50 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Thu, 26 Aug 2010 12:50:52 +0000 (14:50 +0200)

Trivial merge