Merge branch 'master' of https://vcs.maemo.org/git/situare
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Tue, 27 Jul 2010 14:19:34 +0000 (17:19 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Tue, 27 Jul 2010 14:19:34 +0000 (17:19 +0300)

Trivial merge