fix previous bad merge of rails_3_2 branch

Conflicts:
	lib/i18n_routable/outgoing/localizable_formatter.rb