SVN_MERGE

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

........
  r1046700 | mlaurent | 2009-11-09 15:06:56 +0100 (Mon, 09 Nov 2009) | 3 lines
  
  Allow to show or not dnd menu action after a dnd
  or use automatic action. (needs by kmail)
........
  r1073464 | vkrause | 2010-01-12 11:11:56 +0100 (Tue, 12 Jan 2010) | 2 lines
  
  askDndActionMenu -> showDropActionMenu as per API review by Tobias
........

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