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)
commit3a4faa6b639d47efb14a0f70f6e90096506c5cf9
treee37cd2e6017c74087cc1fd4eeddf31f58f80ada1
parent3fd3f7536025224c1ba41a32a2714ede4d821b7e
parentf2ab3152cc50bae88a4b88bb07550e4689a7b755
Merge branch 'master' of https://vcs.maemo.org/git/marble