Allowing older versions of tzinfo to be used in order to fix a dependency issue with Rails 3.
Merge branch 'master' into version1