Hi John,

   Actually that patch will not work - it does not apply cleanly on top of your 
patch.  Here is the corrected version.

Cheers
   Nick