Merge trunk to 622 rev. of branches/plone-2.5 (svn merge -r 577:623 http://svn.quintagroup.com/products/qPingTool/branches/plone-2.5 and svn del unnecessery files)