Fix mix of tab and spaces, make indentation consistent

Submitted by:	ak@