am 767eb427: Merge change If990cab0 into eclair

Merge commit '767eb427fa8eca6c842c629cd4bfbf3551692148' into eclair-mr2

* commit '767eb427fa8eca6c842c629cd4bfbf3551692148':
  Make sure to acknowledge stale broadcasts