merge SVN commit r33972 by adridg
merge SVN commit r33972 by adridg

Minor code cleanup; remove crufty commented out code and normalize debug areas.


svn path=/branches/KDE/3.5/kdepim/; revision=636606

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