Re-commit Greg's 1.262 CHANGES commit on APACHE_2_0_22-branch (There might be a better way to do this, but I think this will work)