1. 2012-01-12 [marble/KDE/4.8] /: Merge branch 'KDE/4.8' of git.kde.org:marble into KD kde-commits Simon Edwards