Merge branch 'master' of https://vcs.maemo.org/git/situare
authorSami Rämö <sami.ramo@ixonos.com>
Tue, 31 Aug 2010 07:27:45 +0000 (10:27 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Tue, 31 Aug 2010 07:27:45 +0000 (10:27 +0300)

Trivial merge