Merge branch 'master' into execution-context

Conflicts:
	src/library/scala/package.scala

1 files changed, 19 insertions, 0 deletions

diff --git a/test/files/run/si5375.scala b/test/files/run/si5375.scala
new file mode 100644
index 0000000000..e4b329deae
--- /dev/null
+++ b/test/files/run/si5375.scala
@@ -0,0 +1,19 @@
+
+
+
+import collection.parallel.CompositeThrowable
+
+
+
+object Test {
+  
+  def main(args: Array[String]) {
+    val foos = (1 to 1000) toSeq;
+    try {
+      foos.par.map(i => if (i % 37 == 0) sys.error("i div 37") else i)
+    } catch {
+      case CompositeThrowable(thr) => println("Composite throwable")
+    }
+  }
+  
+}