am 87c57d89: am 8b213f1a: Merge change 24474 into eclair

Merge commit '87c57d892996f666497644e205521168611a1210'

* commit '87c57d892996f666497644e205521168611a1210':
  Fix an infinite loop in time2sub.