Comment 22 for bug 2004580

Cool, thanks.

Yeah I ported the newline and indentation changes as well, to potentially allow future patches to apply more cleanly, but it's a detail (you also have some tab-based indentation mixed with spaces).

Thanks for addressing this quickly!