FYI,

I've checked in the attached.  I tweaked the code and ChangeLog to 
comply with GNU conventions (and resisted the temptation to change the 
macro into a function :-).

thanks!
Andrew