Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: fix indentation in option parsing loop

Conflicts:
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>