SVN commit 1272508 by fischer: Some changes from gsoc-umbrello applied. That reduces the differences. M +5 -5 associationwidget.cpp M +310 -318 floatingtextwidget.cpp M +11 -25 floatingtextwidget.h http://websvn.kde.org/?view=rev&revision=1272508