sync with branches/KDE/3.5 (r630936:631974)