Preliminary work (likely moot) on adding fixes.
Authored by: jimwinston 2010-01-27
Parent: [r677]
Child: [r679]