added `locally' to Predef.

added overloaded hashes to Predef.
some small changes.

2 files changed, 22 insertions, 0 deletions

diff --git a/test/files/pos/t2569/Child.scala b/test/files/pos/t2569/Child.scala
new file mode 100644
index 0000000000..64f4dc172f
--- /dev/null
+++ b/test/files/pos/t2569/Child.scala
@@ -0,0 +1,9 @@
+package varargs
+
+  class Child extends Parent {
+
+    override def concatenate(strings: String*): String =
+      strings map("\"" + _ + "\"") mkString("(", ", ", ")")
+
+  }
+
diff --git a/test/files/pos/t2569/Parent.java b/test/files/pos/t2569/Parent.java
new file mode 100644
index 0000000000..89421becbd
--- /dev/null
+++ b/test/files/pos/t2569/Parent.java
@@ -0,0 +1,13 @@
+package varargs;
+
+  public class Parent {
+
+      public String concatenate(String... strings) {
+          StringBuilder builder = new StringBuilder();
+          for (String s : strings) {
+              builder.append(s);
+          }
+          return builder.toString();
+      }
+
+  }