SVN_MERGE

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

........
  r1047617 | skelly | 2009-11-11 16:58:09 +0100 (Wed, 11 Nov 2009) | 1 line
  
  Remove implementation of methods which exist in QSortFilterProxyModel now.
........
  r1047618 | skelly | 2009-11-11 16:58:14 +0100 (Wed, 11 Nov 2009) | 1 line
  
  Remove implementation of methods which exist in QSortFilterProxyModel now.
........

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