Merge commit 'refs/pull/1574/head' into merge-210

* commit 'refs/pull/1574/head': (24 commits)
  Fixing issue where OSGi bundles weren't getting used for distribution.
  Fixes example in Type.asSeenFrom
  Fix for SI-6600, regression with ScalaNumber.
  SI-6562 Fix crash with class nested in @inline method
  Brings copyrights in Scaladoc footer and manpage up-to-date, from 2011/12 to 2013
  Brings all copyrights (in comments) up-to-date, from 2011/12 to 2013
  SI-6606 Drops new icons in, replaces abstract types placeholder icons
  SI-6132 Revisited, cleaned-up, links fixed, spelling errors fixed, rewordings
  Labeling scala.reflect and scala.reflect.macros experimental in the API docs
  Typo-fix in scala.concurrent.Future, thanks to @pavelpavlov
  Remove implementation details from Position (they are still under reflection.internal). It probably needs more cleanup of the api wrt to ranges etc but let's leave it for later
  SI-6399 Adds API docs for Any and AnyVal
  Removing actors-migration from main repository so it can live on elsewhere.
  Fix for SI-6597, implicit case class crasher.
  SI-6578 Harden against synthetics being added more than once.
  SI-6556 no assert for surprising ctor result type
  Removing actors-migration from main repository so it can live on elsewhere.
  Fixes SI-6500 by making erasure more regular.
  Modification to SI-6534 patch.
  Fixes SI-6559 - StringContext not using passed in escape function.
  ...

Conflicts:
	src/actors-migration/scala/actors/migration/StashingActor.scala
	src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
	src/compiler/scala/tools/nsc/settings/AestheticSettings.scala
	src/compiler/scala/tools/nsc/transform/Erasure.scala
	src/library/scala/Application.scala
	src/library/scala/collection/immutable/GenIterable.scala.disabled
	src/library/scala/collection/immutable/GenMap.scala.disabled
	src/library/scala/collection/immutable/GenSeq.scala.disabled
	src/library/scala/collection/immutable/GenSet.scala.disabled
	src/library/scala/collection/immutable/GenTraversable.scala.disabled
	src/library/scala/collection/mutable/GenIterable.scala.disabled
	src/library/scala/collection/mutable/GenMap.scala.disabled
	src/library/scala/collection/mutable/GenSeq.scala.disabled
	src/library/scala/collection/mutable/GenSet.scala.disabled
	src/library/scala/collection/mutable/GenTraversable.scala.disabled
	src/library/scala/collection/parallel/immutable/ParNumericRange.scala.disabled

1 files changed, 14 insertions, 0 deletions

diff --git a/test/files/run/t6534.scala b/test/files/run/t6534.scala
new file mode 100644
index 0000000000..33df97e41e
--- /dev/null
+++ b/test/files/run/t6534.scala
@@ -0,0 +1,14 @@
+trait Foo extends Any { override def equals(x: Any) = false }
+trait Ding extends Any { override def hashCode = -1 }
+
+class Bippy1(val x: Int) extends AnyVal with Foo { }  // warn
+class Bippy2(val x: Int) extends AnyVal with Ding { } // warn
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    val b1 = new Bippy1(71)
+    val b2 = new Bippy2(71)
+    assert(b1 == b1 && b1.## == b1.x.##, ((b1, b1.##)))
+    assert(b2 == b2 && b2.## == b2.x.##, ((b2, b2.##)))
+  }
+}