Merge change I60ff11dc into eclair

* changes:
  fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange
tree: 4040c48baba616d610e8899f05ab2592a432b3b1
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE