scala/scala — pull request #2366 by retronym (2013-04-08 07:07:45+00:00)
Title: Merge branch 'master' into java7

Conflicts:
build.xml

Also removed the warning about Java7 not being able to
build the distribution, which doesn't apply to this branch.

Review by @gkossakowski