Log Message: Update to pmccabe-2.5-CVS20081026, similar as suggested by Marco Schuetz in PR 39749, but later version. Passes test target.