Merge branch 'master' of https://vcs.maemo.org/git/marble
authorDennis Nienhüser <nienhues@fzi.de>
Mon, 3 Jan 2011 16:19:51 +0000 (11:19 -0500)
committerDennis Nienhüser <nienhues@fzi.de>
Mon, 3 Jan 2011 16:19:51 +0000 (11:19 -0500)
commitc5983229ca26fd28e7a27f729c6e908e089b5bef
tree77f5746991a6c5342f742167b34dd801cef29ed0
parent41694ffec0c4ce228ec129f8de10f4f0f322ccf8
parent423b701ce52bcce865a4eb75c35ef928879739a7
Merge branch 'master' of https://vcs.maemo.org/git/marble