Fix for bug #2479317 (patch #2496558) by kylev. Make some time handling
stuff more consistent.
Authored by: adustman 2009-03-11
Parent: [r615]
Child: [r617]
