Merge branch 'master' of https://vcs.maemo.org/git/situare
authorVille Tiensuu <ville.tiensuu@ixonos.com>
Thu, 3 Jun 2010 06:22:07 +0000 (09:22 +0300)
committerVille Tiensuu <ville.tiensuu@ixonos.com>
Thu, 3 Jun 2010 06:22:07 +0000 (09:22 +0300)

Trivial merge