Merge branch 'master' of https://vcs.maemo.org/git/situare
authorVille Tiensuu <ville.tiensuu@ixonos.com>
Mon, 24 May 2010 11:41:02 +0000 (14:41 +0300)
committerVille Tiensuu <ville.tiensuu@ixonos.com>
Mon, 24 May 2010 11:41:02 +0000 (14:41 +0300)

Trivial merge