Merge branch 'master' of https://vcs.maemo.org/git/speedfreak
authorOlavi Pulkkinen <olavi.pulkkinen@fudeco.com>
Wed, 24 Mar 2010 12:14:43 +0000 (14:14 +0200)
committerOlavi Pulkkinen <olavi.pulkkinen@fudeco.com>
Wed, 24 Mar 2010 12:14:43 +0000 (14:14 +0200)

Trivial merge