Fix up a botched cherry-pick

This commit is contained in:
Matthias Clasen 2010-09-17 11:05:42 -04:00
parent d7cc714705
commit 4850fa57f9

File diff suppressed because it is too large Load Diff