Add some better handling of resets.
Add some better handling of resets.


svn path=/trunk/playground/pim/kjotsrewrite/akonadi_next/; revision=932711

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