The attached diff should fix it for you. I'll commit later if nobody complains.
It appears this still hasn't been applied. I just applied it myself and it works for me; is there anything stopping this from being committed?
Also note that you might want to wipe out the tab that's in the midst of all those non-tab indents while you're at it :)
-Jared