* Merge with Debian Unstable, remaining changes: - Keep bumped replace/conflicts versions where necessary - Suggest instead of recommend kfind, ruby in dolphin also suggests konsole, kompare - Reduce the x-www-browser priority for konqueror to 30 as rekonq is the default Kubuntu browser. - Rename folderview_rename.diff to kubuntu_25_folderview_rename.diff