SVN commit 522836 by okellogg: apply commit 522834 from branches/KDE/3.5 M +51 -46 associationwidget.cpp M +7 -5 dialogs/settingsdlg.cpp M +3 -5 dialogs/settingsdlg.h M +1 -0 optionstate.h M +4 -5 uml.cpp