Merge change I70e1f7a6 into eclair

* changes:
  Fix the selection of locale from SIM mcc.