Merge branch 'master' of https://vcs.maemo.org/git/speedfreak
authorOlavi Pulkkinen <olavi.pulkkinen@webinfo.fi>
Wed, 10 Mar 2010 08:24:15 +0000 (10:24 +0200)
committerOlavi Pulkkinen <olavi.pulkkinen@webinfo.fi>
Wed, 10 Mar 2010 08:24:15 +0000 (10:24 +0200)

Trivial merge