am 39e67734: (-s ours) do not merge: fix copy/paste using trackball on passion

Merge commit '39e6773431e6010c5066c0e13facfd943c932c7e' into eclair-mr2

* commit '39e6773431e6010c5066c0e13facfd943c932c7e':
  do not merge: fix copy/paste using trackball on passion