Applied a combination of Andy's patch and mine in r24516.

Reply via email to