Cleaned up Duration for the standard library.

 - Removed Timeout from the library. Each library should provide its own implementation of Timeout
 - Removed duration package object and replaced it with regular object
 - Removed usages of post Java 1.5 TimeUnit members
 - Added factory methods for FiniteDuration
 - Cleaned up some unnecessary comments
 - Merged duration DSL with Duration.scala file

Review by: @phaller

1 files changed, 1 insertions, 1 deletions

diff --git a/src/library/scala/concurrent/ExecutionContext.scala b/src/library/scala/concurrent/ExecutionContext.scala
index eb1b3355c0..c4a45f9fb5 100644
--- a/src/library/scala/concurrent/ExecutionContext.scala
+++ b/src/library/scala/concurrent/ExecutionContext.scala
@@ -12,7 +12,7 @@ package scala.concurrent
 
 import java.util.concurrent.atomic.{ AtomicInteger }
 import java.util.concurrent.{ Executors, Future => JFuture, Callable }
-import scala.util.Duration
+import scala.concurrent.util.Duration
 import scala.util.{ Try, Success, Failure }
 import scala.concurrent.forkjoin.{ ForkJoinPool, RecursiveTask => FJTask, RecursiveAction, ForkJoinWorkerThread }
 import scala.collection.generic.CanBuildFrom