Pierre Frisch - 2010-03-29

Fixed a bad issue that would prevent proper response to queries.
Adjusted the timeouts to make them work by default.