Replay changeset 70249:b571c7a8cf2e from fubar branch.  Original commit
message:

Merging post 2.6.7rc2 changes from Subversion.
2 files changed