am 08211fc1: am 1e49340a: Merge change 24320 into eclair

Merge commit '08211fc192db0bd48e78103678a902c32d67480d'

* commit '08211fc192db0bd48e78103678a902c32d67480d':
  Simplify networking code initialization using static structures instead of code.