am 520d6840: am 667543cd: Merge "Revert "Use the content width to calculate...
am 520d6840: am 667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo
Merge commit '520d6840' into kraken
* commit '520d6840':
Revert "Use the content width to calculate the zoom overview"