Incorrectly providing program name the same as log message even when block is not provided.
Merge branch '3-2-stable' of https://github.com/carsonreinke/rails into 3-2-stable

Conflicts:
	activesupport/lib/active_support/tagged_logging.rb