Merge branch 'KDE/4.8' into KDE/4.9
Merged via `git merge --log --edit --no-ff --stat -s recursive'. According to the diffstat, the only actual changes came from the solid-hal commit below, as expected. * KDE/4.8: HAL: Use the filtering code in HalDevice in devicesFromQuery(). Fix mem leak (cherry picked from commit b70d6c3d5a021bc37b962c01fc57b6717e9f2868) Fix mem leak. Found during debug kmail (cherry picked from commit 0fddae9da44c7edb2140aeb95b4471e2521b1735) Allow derived classes to return invalid index in mapToSource. SVN_SILENT made messages (.desktop file)
This commit is contained in:
commit
c0d3b534e2