* commit '9835abb6':
  network: uniform ff_listen_bind and ff_listen_connect

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