It looks like you two may have mixed tabs and spaces for indentation.  You can blame me for this, since I use tabs while a lot of people prefer spaces.

Generally you should pick one and run with it -- in this case since I was using tabs, you should probably have just used only tabs for indentation, never spaces.