Merged r8761 from trunk
attachment: fix that diff type is not saved in user preference.
Authored by: tmaruyama 2012-02-04
Parent: [r8762]
Child: [r8764]