SVN_MERGE

Merged revisions 1058202,1059645 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/branches/work/akonadi-ports/kdepimlibs

........
  r1058202 | osterfeld | 2009-12-04 09:49:38 +0100 (Fri, 04 Dec 2009) | 2 lines
  
  allow replacing an existing attribute. This allows classes using a specific attribute to just register them e.g. in their constructor (like KMail's FolderSelectionTreeView does), potentially multiple times.
........
  r1059645 | ervin | 2009-12-07 08:42:05 +0100 (Mon, 07 Dec 2009) | 2 lines
  
  Build with QT_STRICT_ITERATORS.
........

svn path=/trunk/KDE/kdepimlibs/; revision=1061110