Merge remote-tracking branch 'upstream/master' into t1118
Merge branch 'master' into feature/pc-execution-contexts
Fix tasksupport field initialization for the checkInit build.
Merge remote-tracking branches 'soc/fix-todos' and 'axel22/feature/pc-execution-contexts' into develop
Merge branch 'master' into merge-inline

Conflicts:
	lib/scala-compiler.jar.desired.sha1
	lib/scala-library-src.jar.desired.sha1
	lib/scala-library.jar.desired.sha1
	src/compiler/scala/reflect/internal/Definitions.scala
	src/compiler/scala/reflect/internal/Importers.scala
	src/compiler/scala/reflect/internal/Symbols.scala
	src/compiler/scala/reflect/internal/Trees.scala
	src/compiler/scala/reflect/internal/Types.scala
	src/compiler/scala/tools/nsc/Global.scala
	src/compiler/scala/tools/nsc/transform/Erasure.scala
	src/compiler/scala/tools/nsc/transform/LiftCode.scala
	src/compiler/scala/tools/nsc/transform/UnCurry.scala
	src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
	test/files/run/programmatic-main.check
	test/files/speclib/instrumented.jar.desired.sha1
New starr to support new fundamental laws of reality.

And grueling recovery from branch drift.

Merges a portion (and only a portion) of topic/inline into master.
The major changes which come with this merge are:

  AnyVal is unsealed, can be extended directly.
  ScalaObject is no longer with us.
Cleaning up stray ScalaObject references.
Merge branch 'merge-inline' of /scratch/trunk3 into develop
Merge remote-tracking branch 'odersky/topic/inline' into merge-inline

Conflicts:
	lib/scala-compiler.jar.desired.sha1
	lib/scala-library-src.jar.desired.sha1
	lib/scala-library.jar.desired.sha1
	src/compiler/scala/reflect/internal/Definitions.scala
	src/compiler/scala/reflect/internal/Symbols.scala
	src/compiler/scala/tools/nsc/Global.scala
	src/compiler/scala/tools/nsc/transform/Constructors.scala
	src/compiler/scala/tools/nsc/transform/Erasure.scala
	src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
	src/compiler/scala/tools/nsc/typechecker/Contexts.scala
	src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
	src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala
	src/library/scala/Function0.scala
	src/library/scala/Function1.scala
	src/library/scala/Function10.scala
	src/library/scala/Function11.scala
	src/library/scala/Function12.scala
	src/library/scala/Function13.scala
	src/library/scala/Function14.scala
	src/library/scala/Function15.scala
	src/library/scala/Function16.scala
	src/library/scala/Function17.scala
	src/library/scala/Function18.scala
	src/library/scala/Function19.scala
	src/library/scala/Function2.scala
	src/library/scala/Function20.scala
	src/library/scala/Function21.scala
	src/library/scala/Function22.scala
	src/library/scala/Function3.scala
	src/library/scala/Function4.scala
	src/library/scala/Function5.scala
	src/library/scala/Function6.scala
	src/library/scala/Function7.scala
	src/library/scala/Function8.scala
	src/library/scala/Function9.scala
	test/files/codelib/code.jar.desired.sha1
	test/files/neg/anyval-children-2.check
	test/files/run/programmatic-main.check
Eliminate build-breaking import.

...from m. odersky's private collection of mysterious imports.
The rest of the inline classes.

Have you often thought that programming is just like the
movie 'Hackers', only with less rollerblading? Now that we
have @inline skates, that last caveat can be retired.
It's just like the movie 'Hackers'.

Signed-off-by: Zero Cool
Merge branch 'master' into merge-inline
Whitespace and a couple checkfile updates.
Merge branch 'master' of git://github.com/scala/scala into t1118