Commit c86a670ce6d264fba10a38f68d65e4b4ab27cba6

ckolivas 2012-02-04T13:06:04

Some networks can take a long time to resolve so go back to 60 second timeouts instead of 15.