patches 4 & 5 sent incorrectly

[Paul Walmsley]

so, stupid thinko here, sent the wrong patches for 4 and 5 of the previous 
set.  Will resend those two.  Sorry everyone,

- Paul