Merge remote branch 'mainline/svn.kde.org' into svn.kde.org
authorSiddharth Srivastava <akssps011@gmail.com>
Tue, 17 Aug 2010 19:31:41 +0000 (01:01 +0530)
committerSiddharth Srivastava <akssps011@gmail.com>
Tue, 17 Aug 2010 19:31:41 +0000 (01:01 +0530)
commitc4e89a703921d47c2b48d4818ccb1d350b36c3b6
tree069f04b23d663600a4ecf719e3b13b87b48fd9d0
parent39be1154a21fcf7c5275c6f99a72aafaa7856b15
parentef74be70281aed1e4da3529b111fc24c6caf7048
Merge remote branch 'mainline/svn.kde.org' into svn.kde.org
src/marble.qrc