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)
commitd4cc31e6f33f81fb1c79706d66c0d02ffb82e9b5
treebb9cb73097dfe5ba57408462f9818048e129ada0
parentf5fee53f6c6ad525fe3c6e8689f65d6b629293d2
parente6e41a78976e563772eb2ae113301ae1793308ad
Merge branch 'master' of https://vcs.maemo.org/git/marble