remove useless debug marker
fix spaces
restore accidentally removed line
Merge branch 'wheezy'