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