Updated for treatment of infinite timestamps.
Authored by: michaeloa 2011-05-11
Parent: [r2814]
Child: [r2816]
