* commit '342fc46c':
  cmdutils: Add a stream specifier to map usable streams

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