Bad reference to TZInfo in Rails 3.0.0 beta master

I get this error:

ActionView::Template::Error (uninitialized constant ActiveSupport::TimeZone::TZInfo)

which happens in

~/.bundle/ruby/1.9.1/bundler/gems/rails-16a5e918a06649ffac24fd5873b875daf66212ad-master/activesupport/lib/active_support/values/time_zone.rb:309:in tzinfo'

Looking in the source

    # TODO: Preload instead of lazy load for thread safety
    def tzinfo
      require 'tzinfo' unless defined?(TZInfo)
      @tzinfo ||= TZInfo::Timezone.get(MAPPING[name])
    end

as a quick fix can be changed to:

    # TODO: Preload instead of lazy load for thread safety
    def tzinfo
      require 'tzinfo' unless defined?(::TZInfo)
      @tzinfo ||= ::TZInfo::Timezone.get(MAPPING[name])
    end

I guess though in the long term addressing the todo automatically fix this.