SVN_MERGE
Merged revisions 994679,994683,996887-996888 via svnmerge from
https://vkrause@svn.kde.org/home/kde/branches/work/akonadi-ports/kdepimlibs
........
r994679 | cberzan | 2009-07-11 07:55:18 +0200 (Sat, 11 Jul 2009) | 5 lines API dox for the contentEncoding enum. MERGE: trunk
........
r994683 | cberzan | 2009-07-11 08:04:59 +0200 (Sat, 11 Jul 2009) | 4 lines Add KMime::Content::clearContents() method to provide easy removal of sub-Contents without the risk of this Content being converted from multipart to single-part. Reviewed at http://reviewboard.kde.org/r/963/ MERGE: trunk
........
r996887 | cberzan | 2009-07-15 08:37:18 +0200 (Wed, 15 Jul 2009) | 3 lines api docs for the contentDisposition enum (the CDparallel is unused, and http://www.iana.org/assignments/mail-cont-disp doesn't know about it)
........
r996888 | cberzan | 2009-07-15 08:39:03 +0200 (Wed, 15 Jul 2009) | 2 lines CharFreq: be more strict about matching CRLFs, be more specific in the api docs, and add a unit test
........
svn path=/trunk/KDE/kdepimlibs/; revision=997759