ref: 034cea5e726b851294baad4d77e81bb6ce45703c
parent: eacaabc5921d22438e1123a8ac2a256dbefce187
parent: bb0ca87a0d7c347e924dae4b83af81fe9454dad2
author: John Koleszar <jkoleszar@google.com>
date: Wed Jun 29 07:36:51 EDT 2011
Merge "guard against space/time distortion"