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)
commitcd00a43ecd3bc1a2e5fb021582abc778e714bc96
treeb67b2a3c13b2676e5461073e6afd40057160a08e
parentb3509f310144f92881f982a2aa6aa9d5ef626f26
parent89377a988a3f92bf6f9d8833b52a75db381bb54a
Merge branch 'master' of https://vcs.maemo.org/git/speedfreak

Conflicts:
Client/UI.pro