Merge "Upgrade to tzdata2011a."