Merge branch 'master' of https://vcs.maemo.org/git/situare
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Mon, 6 Sep 2010 12:17:33 +0000 (15:17 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Mon, 6 Sep 2010 12:17:33 +0000 (15:17 +0300)

Trivial merge