* commit '06b54e84':
  build: Fix error_resilience code dependencies

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