Merge branch 'master' of https://vcs.maemo.org/git/situare
authorKaj Wallin <kaj.wallin@ixonos.com>
Wed, 26 May 2010 05:20:24 +0000 (08:20 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Wed, 26 May 2010 05:20:24 +0000 (08:20 +0300)

Trivial merge