am b52e9f74: am eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo

Merge commit 'b52e9f748cefaad01fc66a73ddfa707f2446895c' into kraken

* commit 'b52e9f748cefaad01fc66a73ddfa707f2446895c':
  Refactor connection/redirection code, support redirects on reconnection.