Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
CMakeLists.txt
akonadi/CMakeLists.txt
gpgme++/CMakeLists.txt
gpgme++/gpgme++_export.h
gpgme++/gpgsignkeyeditinteractor.cpp
includes/tests/CMakeLists.txt
kabc/CMakeLists.txt
kabc/addressbook.h
kabc/addressee.cpp
kabc/addresseedialog.h
kabc/addresslineedit.h
kabc/distributionlist.h
kabc/distributionlistdialog.h
kabc/formatfactory.h
kabc/plugins/dir/resourcedir.h
kabc/plugins/dir/resourcedirconfig.h
kabc/plugins/file/resourcefile.h
kabc/plugins/file/resourcefileconfig.h
kabc/plugins/ldapkio/resourceldapkio.h
kabc/plugins/net/resourcenet.h
kabc/plugins/net/resourcenetconfig.h
kabc/resource.h
kabc/resourcecached.h
kabc/vcardformat.h
kblog/CMakeLists.txt
kblog/blogpost.cpp
kcal/CMakeLists.txt
kcal/alarm.h
kcal/assignmentvisitor.h
kcal/attachment.h
kcal/attendee.h
kcal/calendar.h
kcal/calendarlocal.h
kcal/calendarnull.h
kcal/calendarresources.cpp
kcal/calendarresources.h
kcal/calfilter.h
kcal/calformat.h
kcal/calhelper.h
kcal/calstorage.h
kcal/comparisonvisitor.h
kcal/confirmsavedialog.h
kcal/customproperties.h
kcal/dndfactory.h
kcal/duration.h
kcal/event.h
kcal/exceptions.h
kcal/filestorage.h
kcal/freebusy.h
kcal/freebusyperiod.h
kcal/freebusyurlstore.h
kcal/htmlexport.h
kcal/icaldrag.h
kcal/icalformat.h
kcal/icaltimezones.h
kcal/imipscheduler.h
kcal/incidence.h
kcal/incidencebase.h
kcal/incidenceformatter.h
kcal/journal.h
kcal/kresult.h
kcal/localdir.desktop
kcal/period.h
kcal/person.h
kcal/qtopiaformat.h
kcal/recurrence.h
kcal/recurrencerule.h
kcal/resourcecached.h
kcal/resourcecachedconfig.cpp
kcal/resourcecachedconfig.h
kcal/resourcecalendar.h
kcal/resourcelocal.h
kcal/resourcelocalconfig.h
kcal/resourcelocaldir.h
kcal/resourcelocaldir_p.h
kcal/resourcelocaldirconfig.h
kcal/scheduler.h
kcal/tests/testcomparisonvisitor.cpp
kcal/tests/testtimesininterval.cpp
kcal/tests/testtimesininterval.h
kcal/todo.h
kcal/vcaldrag.h
kcal/vcalformat.h
kcal/versit/vcc.h
kcal/versit/vobject.h
kcalcore/CMakeLists.txt
kcalcore/memorycalendar.cpp
kcalcore/recurrence.cpp
kcalutils/CMakeLists.txt
kcalutils/incidenceformatter.cpp
kioslave/imap4/CMakeLists.txt
kioslave/pop3/pop3.cpp
kioslave/sieve/sieve.cpp
kmbox/CMakeLists.txt
kontactinterface/CMakeLists.txt
kontactinterface/plugin.cpp
kpimidentities/CMakeLists.txt
kpimidentities/identitymanager.cpp
kpimutils/CMakeLists.txt
kresources/CMakeLists.txt
kresources/configpage.cpp
kresources/configwidget.h
kresources/factory.cpp
kresources/factory.h
kresources/idmapper.cpp
kresources/idmapper.h
kresources/kcmkresources.cpp
kresources/kcmkresources.h
kresources/kcmkresources_export.h
kresources/managerimpl.cpp
kresources/resource.cpp
kresources/resource.h
kresources/tests/CMakeLists.txt
ktnef/formatter.h
mailtransport/CMakeLists.txt
syndication/CMakeLists.txt
syndication/tests/CMakeLists.txt