Manually merge r60521 from trunk.

This commit is contained in:
Georg Brandl 2008-02-05 18:13:15 +00:00
parent b0d28b4c60
commit 479a7e7af6

File diff suppressed because it is too large Load Diff