Merge branch 'master' of https://vcs.maemo.org/git/situare
authorKaj Wallin <kaj.wallin@ixonos.com>
Fri, 28 May 2010 11:54:22 +0000 (14:54 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Fri, 28 May 2010 11:54:22 +0000 (14:54 +0300)

Trivial merge