Merged r9814 from trunk
fix test_user_index of activities controller test fails at Japanese morning and afternoon.
Authored by: tmaruyama 2012-06-11
Parent: [r9817]
Child: [r9819]
