I _think_ this has just fixed an uninitialised-memory bug, but I'm
not sure.

[originally from svn r5177]