Replay changeset 70238:03e488b5c009 from fubar branch. Original commit

message:

Reconcile with the 2.6svn branch.  The 2.6.7 release will be made from
Subversion, but there were differences, so this brings them in sync.  These
changes should *not* propagate to any newer versions.
This commit is contained in:
Barry Warsaw 2011-05-23 15:22:56 -04:00
parent e26bc109ff
commit cf0d8ab818
16 changed files with 45 additions and 35 deletions

File diff suppressed because one or more lines are too long