* commit '56d061ce':
  metasound: add last missing modes (8kHz @ 6kbps per channel)

Conflicts:
	Changelog
	doc/general.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>