Roll back to previous mouse code

Subversion-branch: /trunk
Subversion-revision: 2877
Possible fix to strange mouse behavior (?????)

Subversion-branch: /trunk
Subversion-revision: 2878
Small tweak

Subversion-branch: /trunk
Subversion-revision: 2879