Merge branch 'integration' of https://vcs.maemo.org/git/situare into integration
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 3 May 2010 13:17:16 +0000 (16:17 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 3 May 2010 13:17:16 +0000 (16:17 +0300)

Trivial merge