M and U bits are now updated correctly (hopefully).
Authored by: debug 2007-05-17
Parent: [r4841]
Child: [r4843]
