Merge branch 'master' of https://vcs.maemo.org/git/marble
authorDennis Nienhüser <nienhues@fzi.de>
Mon, 11 Oct 2010 21:09:58 +0000 (23:09 +0200)
committerDennis Nienhüser <nienhues@fzi.de>
Mon, 11 Oct 2010 21:09:58 +0000 (23:09 +0200)

Trivial merge