Fix uninitialised zero fw->orig_hints.width/height_inc.
Another width_inc-zero fix attempt.
Merge remote-tracking branch 'cvs/branch-2_6' into branch-2_6