am 62ee3f4c: (-s ours) am ec988c2f: DO NOT MERGE Added/updated Yahoo provider settings

* commit '62ee3f4cac15e94dccb7795334c0355aa0e80228':
  DO NOT MERGE Added/updated Yahoo provider settings