Merge branch 'master' of https://vcs.maemo.org/git/situare
authorSami Rämö <sami.ramo@ixonos.com>
Wed, 1 Sep 2010 13:20:30 +0000 (16:20 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Wed, 1 Sep 2010 13:20:30 +0000 (16:20 +0300)

Trivial merge