Merge branch 'master' of https://vcs.maemo.org/git/situare
authorSami Rämö <sami.ramo@ixonos.com>
Tue, 8 Jun 2010 11:13:59 +0000 (14:13 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Tue, 8 Jun 2010 11:13:59 +0000 (14:13 +0300)

Trivial merge