Merge remote branch 'mainline/svn.kde.org' into svn.kde.org
authorSiddharth Srivastava <akssps011@gmail.com>
Sun, 15 Aug 2010 18:25:44 +0000 (23:55 +0530)
committerSiddharth Srivastava <akssps011@gmail.com>
Sun, 15 Aug 2010 18:25:44 +0000 (23:55 +0530)
commit038e6628c0cbae3789e84a0e82c973348dd39b14
treee90374c4362dffaf908fc7ea92170aff0e12f942
parentc3e4b6f74e631061d70a8ed547258d0bca4ac981
parent61942a39df89706f403f2ef89347df15b7c24ba6
Merge remote branch 'mainline/svn.kde.org' into svn.kde.org
src/marble.qrc