merge with trunk/2.5 at r23876

[[Split portion of a mixed commit.]]
This commit is contained in:
2009-10-22 23:22:05 +00:00
parent 36bb566d4e
commit 8f788c64db
1313 changed files with 104799 additions and 120780 deletions

File diff suppressed because it is too large Load Diff