Merge branch 'master' of http://darcs.haskell.org/testsuite

testsuite/tests/concurrent/2317/all.T

 test('2317',
      [skip_if_fast,
-      reqlib('parallel')],
+      reqlib('parallel'), reqlib('random')],
      multimod_compile_and_run,
      ['2317',''])

testsuite/tests/perf/compiler/all.T

@@ -82,9 +82,9 @@ test('T4801',
       if_wordsize(32,
       #                                expected value x86/OSX: 27
           compiler_stats_num_field('peak_megabytes_allocated', 25, 29)),
-      # expected value: 48-49 (amd64/Linux):
+      # expected value: 48-54 (amd64/Linux):
       if_wordsize(64,
-          compiler_stats_num_field('peak_megabytes_allocated', 47, 50)),
+          compiler_stats_num_field('peak_megabytes_allocated', 47, 54)),
       # expected value: 58 (amd64/OS X):
       if_platform('x86_64-apple-darwin',
           compiler_stats_num_field('peak_megabytes_allocated', 56, 60)),
@@ -103,7 +103,7 @@ test('T4801',
       if_wordsize(32,
       #                    expected value: x86/OS X:  9651948
           compiler_stats_num_field('max_bytes_used',  9000000,
-                                                     10000000)),
+                                                     12000000)),
       # expected value: 18188272 (amd64/Linux)
       #                 10290952 (windows)
       if_wordsize(64,