Merge pull request scala#88 from lrytz/merge-1.0-to-1.1

Merge 1.0 to 1.1

Author: lrytz

src/partest/scala/tools/partest/package.scala

@@ -177,7 +177,7 @@ package object partest {
   )
 
   def allPropertiesString = {
-    import scala.collection.JavaConversions._
-    System.getProperties.toList.sorted map { case (k, v) => "%s -> %s\n".format(k, v) } mkString ""
+    import scala.collection.JavaConverters._
+    System.getProperties.asScala.toList.sorted map { case (k, v) => "%s -> %s\n".format(k, v) } mkString ""
   }
 }