GpgME::Key::merge -> mergeWith, for consistency with KeyListResult::mergeWith
GpgME::Key::merge -> mergeWith, for consistency with KeyListResult::mergeWith

svn path=/branches/work/kdab-post-4.0/kdepim/; revision=758594

lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi