Merge branch '4.5.7'

This commit is contained in:
Tom Eastep 2012-08-26 08:15:05 -07:00
commit f2cecfc33a