Merge branch 'master' of https://vcs.maemo.org/git/speedfreak
authorOlavi Pulkkinen <olavi.pulkkinen@webinfo.fi>
Mon, 8 Mar 2010 10:36:16 +0000 (12:36 +0200)
committerOlavi Pulkkinen <olavi.pulkkinen@webinfo.fi>
Mon, 8 Mar 2010 10:36:16 +0000 (12:36 +0200)

Trivial merge