Merge branch 'jskia73' of https://vcs.maemo.org/git/situare into jskia73
authorJukka Saastamoinen <juksa@juksa-laptop.(none)>
Sat, 10 Apr 2010 09:38:00 +0000 (12:38 +0300)
committerJukka Saastamoinen <juksa@juksa-laptop.(none)>
Sat, 10 Apr 2010 09:38:00 +0000 (12:38 +0300)

Trivial merge