Updating timeout#7

Merged

corasaurus-hex merged 1 commit intozencoder:masterfrom

mchristopher:master

Jul 17, 2012

Commits on Jul 11, 2012

Update default timeout to match enforced timeout.
Michael Christopher
committed