am aea1b3b2: Disambiguation between multiple pointers and swipe gestures.

Merge commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d' into eclair-mr2

* commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d':
  Disambiguation between multiple pointers and swipe gestures.