OK to commit the attached patch?

-Sandra