This should also be pulled up to 1.9 and 1.8.  The code change should 
apply cleanly.  The man page change isn't terribly important if it doesn't 
apply.