Merge branch 'master' of https://vcs.maemo.org/git/situare
authorSami Rämö <sami.ramo@ixonos.com>
Thu, 29 Jul 2010 12:42:23 +0000 (15:42 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Thu, 29 Jul 2010 12:42:23 +0000 (15:42 +0300)

Trivial merge