* commit '481a3667':
  cmdutils: allow matching by metadata in stream specifiers

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