SVN_MERGE

Merged revisions 1012227,1012301-1012302,1012413-1012414,1012441,1012582,1012617,1012649 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

........
  r1012227 | vkrause | 2009-08-17 09:40:04 +0200 (Mon, 17 Aug 2009) | 6 lines
  
  Only display troubleshooting hints when something went wrong, seems to
  confuse people otherwise.
  
  BUG: 202122
  CCBUG: 203125
........
  r1012301 | tokoe | 2009-08-17 14:03:02 +0200 (Mon, 17 Aug 2009) | 5 lines
  
  Enable/disable the 'Delete Items' action depending on
  whether the parent resource allows deletion of items.
  
  BUG: 203873
........
  r1012302 | vkrause | 2009-08-17 14:10:58 +0200 (Mon, 17 Aug 2009) | 2 lines
  
  Don't load stuff into the cache that we neither want nor need.
........
  r1012413 | vkrause | 2009-08-17 18:27:19 +0200 (Mon, 17 Aug 2009) | 2 lines
  
  Support item and collection moves in AgentBase::Observer.
........
  r1012414 | vkrause | 2009-08-17 18:27:40 +0200 (Mon, 17 Aug 2009) | 2 lines
  
  Allow to enable hierarchical RID support in CollectionSync.
........
  r1012441 | tokoe | 2009-08-17 19:10:46 +0200 (Mon, 17 Aug 2009) | 3 lines
  
  Return the maximum of getColumnCount() for both header sets,
  that fixes various issues with columns in ETM.
........
  r1012582 | tmcguire | 2009-08-17 22:53:35 +0200 (Mon, 17 Aug 2009) | 3 lines
  
  Add two more useful functions which will be used for inline images in signatures.
  loadImages() is taken and adapted from KMail.
........
  r1012617 | tmcguire | 2009-08-17 23:53:27 +0200 (Mon, 17 Aug 2009) | 2 lines
  
  Add support for inline images in signatures.
........
  r1012649 | tmcguire | 2009-08-18 00:34:00 +0200 (Tue, 18 Aug 2009) | 4 lines
  
  Don't crash on mails where there are two embedded images on the same text block.
  
  BUG: 204214
........

svn path=/branches/work/akonadi-ports/kdepimlibs/; revision=1012822