[FFmpeg-cvslog] Merge commit 'b3c6ee199e75bbad2908253f11e871500dd38531'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 12 21:05:00 2014 +0100| [aa175983a1968f9c390379e0c735910b5e32ac0d] | committer: Michael Niedermayer

Merge commit 'b3c6ee199e75bbad2908253f11e871500dd38531'

* commit 'b3c6ee199e75bbad2908253f11e871500dd38531':
  configure: Group toolchain options together in help output

Conflicts:
	configure

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aa175983a1968f9c390379e0c735910b5e32ac0d
---