am 87584f51: Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1

* commit '87584f51a865cfe8ef19c2b24e858a63cb3e475c':
  Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances