Merge branch 'master' of https://vcs.maemo.org/git/situare
authorlampehe-local <henri.lampela@ixonos.com>
Fri, 18 Jun 2010 12:02:20 +0000 (15:02 +0300)
committerlampehe-local <henri.lampela@ixonos.com>
Fri, 18 Jun 2010 12:02:20 +0000 (15:02 +0300)

Trivial merge