Merge branch 'master' of https://vcs.maemo.org/git/situare
authorKaj Wallin <kaj.wallin@ixonos.com>
Thu, 3 Jun 2010 09:59:44 +0000 (12:59 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Thu, 3 Jun 2010 09:59:44 +0000 (12:59 +0300)

Trivial merge