Logitech LX-700 Mouse Buttons Scrambled

Upgrading to Edgy caused my mousewheel to stop working.

I have a Logitech LX-700 Mouse/Keyboard USB wireless combo.

In Dapper my scroll wheel was mapped as 4 & 5, now it comes up as 6 & 7 (which causes sideways scrolling in most apps, and page fwd-back in firefox. Through some experimentation I discovered that 4 & 5 are now mapped to one of the thumb buttons, and to the button on top that was normally 10 (I think). The wheel tilt buttons are now 8 & 9, they should be 6 & 7. The L R and Center buttons are ok (1,2 &3).

Also the scrollwheel on the keyboard works normally.

My current xorg.conf entry is:

Section "InputDevice"
Identifier "Configured Mouse"
Driver "evdev"
Option "CorePointer"
Option "Name" "Logitech USB Receiver"
Option "WHEELRelativeAxisButtons" "4 5"
(I also tried "WHEELRelativeAxisButtons" "6 7")

The wireless receiver in the above configuaration is connected through USB.

My old entry that worked in Dapper with the wireless receiver connected to PS2 ports. This did not work in Edgy either (Same symtoms as above)

Section "InputDevice"
Identifier "Configured Mouse"
Driver "mouse"
Option "CorePointer"
Option "Device" "/dev/input/mice"
Option "Protocol" "ExplorerPS/2"
Option "Buttons" "10"
Option "Emulate3Buttons" "false"
Option "ZAxisMapping" "4 5"
Option "ButtonMapping" "1 2 3 6 7"
EndSection