Description of problem:
middle mouse button and right button have been interchanged on my 3button mouse.
Using left-handed mouse.

Version-Release number of selected component (if applicable):
xorg-x11-drv-mouse-1.2.3-4.fc9.i386

How reproducible:
always

Steps to Reproduce:
1. Use right mouse button and it behaves as middle click ( paste)
2. middle mouse button behaves as right click
  
Actual results:

ButtonRelease event, serial 27, synthetic NO, window 0x4800001,
    root 0xa5, subw 0x4800002, time 27272545, (40,41), root:(41,563),
    state 0x110, button 1, same_screen YES
<---- This should be button 2

ButtonPress event, serial 27, synthetic NO, window 0x4800001,
    root 0xa5, subw 0x4800002, time 27276745, (40,41), root:(41,563),
    state 0x10, button 2, same_screen YES
<---- This should be button 1


Expected results:
button 1 and 2 should be mapped correctly

Additional info:
On touchpad, i see three buttons as agains 2 from previous release.