Merge branch 'master' of https://vcs.maemo.org/git/speedfreak
authorToni Jussila <toni.jussila@fudeco.com>
Wed, 17 Mar 2010 10:11:09 +0000 (12:11 +0200)
committerToni Jussila <toni.jussila@fudeco.com>
Wed, 17 Mar 2010 10:11:09 +0000 (12:11 +0200)
Conflicts:
Client/UI.pro


Trivial merge