am 17b44ee3: (-s ours) am 21f0f97e: Fix for crespo.

Merge commit '17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01'

* commit '17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01':
  Fix for crespo.