Merge branch 'master' of https://vcs.maemo.org/git/situare
authorlampehe-local <henri.lampela@ixonos.com>
Mon, 31 May 2010 12:38:55 +0000 (15:38 +0300)
committerlampehe-local <henri.lampela@ixonos.com>
Mon, 31 May 2010 12:38:55 +0000 (15:38 +0300)

Trivial merge