Merge "Fix the sloppy detection in the ScaleGestureDetector." into eclair