Merge branch 'master' of https://vcs.maemo.org/git/speedfreak
authorToni Jussila <toni.jussila@fudeco.com>
Fri, 5 Mar 2010 13:13:47 +0000 (15:13 +0200)
committerToni Jussila <toni.jussila@fudeco.com>
Fri, 5 Mar 2010 13:13:47 +0000 (15:13 +0200)

Trivial merge