am b0ac82e9: Merge commit \'bd8ee3d3\' into mm

* commit 'b0ac82e9baf969236be1174b49784500b33e6f48':
  Upgrade to tzdata2012h.