* commit '28306e6d':
  network: factor out bind-listening code
  use my full first name instead of short one in copyrights

Conflicts:
	libavformat/tcp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>