Hello,

Attached is the patch that I ended up checking in.  I'll propose a NEWS
entry momentarily.

-- 
Joel