am 983b8bb0: am d9a16d6e: Merge change 23852 into eclair

Merge commit '983b8bb01c3abc8e338f7779ee62fd6aab2f56a0'

* commit '983b8bb01c3abc8e338f7779ee62fd6aab2f56a0':
  Fix a call to memset(3) with reversed arguments.