Fixes for the state_load() method to make it functional.
Authored by: bugman 2010-01-27
Parent: [r10455]
Child: [r10457]