Merge "fix test to handle PST->PDT changes."
Xavier Ducrohet [Mon, 11 Mar 2013 21:06:22 +0000 (21:06 +0000)]

Trivial merge