Commit 862c88ecbbab93366635c76f82dc5e690eba3d42

Con Kolivas 2013-06-27T07:52:51

Move to slightly more relaxed timeouts for avalon.