Merge branch 'master' of https://vcs.maemo.org/git/situare
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Wed, 11 Aug 2010 14:23:14 +0000 (17:23 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Wed, 11 Aug 2010 14:23:14 +0000 (17:23 +0300)

Trivial merge