am baf56089: (-s ours) am 998c6777: Merge "Never show overscroll if the page scrolls at all." into gingerbread

Merge commit 'baf5608941ae4de2bb5620fc81291f33da9d57ac'

* commit 'baf5608941ae4de2bb5620fc81291f33da9d57ac':
  Never show overscroll if the page scrolls at all.