am 60b67e27: Merge "fix scrolling bug upon pinch-zoom" into gingerbread

* commit '60b67e274a7f4b57a6fedbf6eb3bafdf1cf738ab':
  fix scrolling bug upon pinch-zoom