am 520d6840: am 667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo

Merge commit '520d684093b50c25d06aac652ad4bca42ff7e862' into kraken

* commit '520d684093b50c25d06aac652ad4bca42ff7e862':
  Revert "Use the content width to calculate the zoom overview"