Removed commented-out code. Increased default timeout length to account for potential latency.
Authored by: jtapper@digitalprimates.net 2010-06-14
Parent: [r1793]
Child: [r1795]
