Need review for #3180 please

[Kean Johnston]

> I see this was just committed. In the future could you please include at 
> least the barest details in the commit message rather than completely 
> referring to the ChangeLog?
> 
> For example,
> "SCO port update. See ChangeLog entry 2005/11/07."

Sure. Sorry about that. So many things were touched I didnt know
quite what to put. I'm not usually know for brevity but I guess
this time I was a little *too* brief :)

Kean