SVN_MERGE

CCBUG: 219626
Merged revisions 1060404,1060670-1060671 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/work/akonadi-ports/kdepimlibs

........
  r1060404 | tmcguire | 2009-12-08 21:04:13 +0100 (Tue, 08 Dec 2009) | 3 lines
  
  Add test for walking the parent collections after parsing a collection.
  Fails because of some uninitalized memory reads.
........
  r1060670 | tmcguire | 2009-12-09 16:35:06 +0100 (Wed, 09 Dec 2009) | 5 lines
  
  Cleanup the test.
  
  I hope adjusting the HRID test was ok, I guess adding another test caused the
  negative collections to be even more negative.
........
  r1060671 | tmcguire | 2009-12-09 16:37:59 +0100 (Wed, 09 Dec 2009) | 8 lines
  
  Fix crash in ProtocolHelperTest::testParentCollectionAfterCollectionParsing().
  See comments for details.
  This is the best fix I could come up with, I hope it doesn't hurt performance too much.
  
  (And the lesson we have learned: Don't cast pointers to references and then return them)
  
  Volker, you'll want to review this.
........

svn path=/trunk/KDE/kdepimlibs/; revision=1066751