Merge branch 'master' of https://vcs.maemo.org/git/situare
authorVille Tiensuu <ville.tiensuu@ixonos.com>
Tue, 1 Jun 2010 07:37:40 +0000 (10:37 +0300)
committerVille Tiensuu <ville.tiensuu@ixonos.com>
Tue, 1 Jun 2010 07:37:40 +0000 (10:37 +0300)

Trivial merge