am cff1093f: Merge "Fix ISO country code of Slovenia." into honeycomb-mr2

* commit 'cff1093fd2a2e64634e122e32d489aa40113c22f':
  Fix ISO country code of Slovenia.