Merge branch 'master' of https://vcs.maemo.org/git/marble
authorDennis Nienhüser <nienhues@fzi.de>
Mon, 12 Apr 2010 20:27:49 +0000 (22:27 +0200)
committerDennis Nienhüser <nienhues@fzi.de>
Mon, 12 Apr 2010 20:27:49 +0000 (22:27 +0200)

Trivial merge