Merge from default -> production

$ hg merge -P -r default
changeset:   3070:7e3ded1a7b41
tag:         tip
parent:      3068:35a9469638df
user:        Chris Cooper <ccooper@deadsquid.com>
date:        Fri Mar 22 11:49:56 2013 -0400
summary:     Bug 780291 - Increase script timeout for fuzzing by 5 minutes - r=armenzg

--HG--
branch : production-0.8

misc.py

@@ -2348,8 +2348,8 @@ def generateFuzzingObjects(config, SLAVES):
         config['scripts_repo'],
         'scripts/fuzzing/fuzzer.sh',
         interpreter='bash',
-        script_timeout=1500,
-        script_maxtime=1800,
+        script_timeout=1800,
+        script_maxtime=2100,
         reboot_command=['python',
                         'scripts/buildfarm/maintenance/count_and_reboot.py',
                         '-f', './reboot_count.txt',