This commit was manufactured by cvs2svn to create branch 'RC_1_30_0'.
Merged fix for regression test failure for VA6 from trunk to branch
Fixed broken patch.