SVN_MERGE:

Merged revisions 1149942,1150563 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.5/kdepimlibs

........
  r1149942 | tokoe | 2010-07-14 18:29:32 +0200 (Wed, 14 Jul 2010) | 6 lines
  
  - Use guards to do proper painter->save()/restore() calls
  - Set the right text color for unselected state
  
  No idea why suddenly the painter object passed into paint()
  has not the palette text color set on its pen object...
........
  r1150563 | tokoe | 2010-07-16 10:46:59 +0200 (Fri, 16 Jul 2010) | 2 lines
  
  Remove intermediate local fix, the real problem was oxygen which has been fixed now
........

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