am 88cd1a21: Merge "Upgrade to tzdata2012g."

* commit '88cd1a2188cde62d9f94881549791b7c197b2116':
  Upgrade to tzdata2012g.