Fix some problems with merge.

spec/runner.html

@@ -20,6 +20,9 @@
   <script type="text/javascript" src="../src/Suite.js"></script>
   <script type="text/javascript" src="../src/mock-timeout.js"></script>
 
+  <script type="text/javascript" src="../lib/TrivialReporter.js"></script>
+
+
   <script type="text/javascript">
     jasmine.include('suites/EnvTest.js', true);
     jasmine.include('suites/ExceptionsTest.js', true);
@@ -31,6 +34,7 @@
     jasmine.include('suites/RunnerTest.js', true);
     jasmine.include('suites/SpecRunningTest.js', true);
     jasmine.include('suites/SpyTest.js', true);
+    jasmine.include('suites/TrivialReporterTest.js', true);
   </script>
 
   <link href="../lib/jasmine.css" rel="stylesheet"/>

spec/suites/TrivialReporterTest.js

@@ -23,7 +23,7 @@ describe("TrivialReporter", function() {
     trivialReporter = new jasmine.TrivialReporter({ body: body });
     trivialReporter.reportRunnerStarting({
       getAllSuites: function() {
-        return [ new jasmine.Suite(null, "suite 1", null, null) ];
+        return [ new jasmine.Suite({}, "suite 1", null, null) ];
       }
     });