This commit was manufactured during conversion from CVS to merge the end of the ParaView 2.2 release branch.