diff --git a/kernel/src/main/scala/ManagedActorScheduler.scala b/kernel/src/main/scala/ManagedActorScheduler.scala
new file mode 100644
index 0000000000..cede9e6a5b
--- /dev/null
+++ b/kernel/src/main/scala/ManagedActorScheduler.scala
@@ -0,0 +1,61 @@
+/**
+* Copyright (C) 2009 Scalable Solutions.
+*/
+
+package se.scalablesolutions.akka.kernel
+
+import net.lag.logging.Logger
+
+import java.util.concurrent.Executors
+
+import scala.actors.{FJTaskScheduler2, Scheduler, IScheduler, Actor}
+
+// FIXME: add managing interface to this class using JMX
+// FIXME: configure one instance per GenericServer
+object ManagedActorScheduler extends Logging {
+  @volatile private var isRegistered = false
+  private var threadPoolSize = 10 
+
+  def register = synchronized {
+    if (!isRegistered) {
+      Scheduler.impl match {
+        case fj: FJTaskScheduler2 =>
+          fj.snapshot
+          fj.shutdown
+        case _ =>
+      }
+
+      Scheduler.impl = {
+        val threadPool = Executors.newFixedThreadPool(threadPoolSize)
+        new IScheduler {
+          def execute(fun: => Unit): Unit = threadPool.execute(new Runnable {
+              def run = {
+                try {
+                  fun
+                } catch {
+                  case e => log.error("Actor scheduler", e)
+                }
+              }
+            })
+
+          def execute(task: Runnable) = es.execute(new Runnable {
+            def run = {
+              try {
+                task.run
+              } catch {
+                case e => log.error("Actor scheduler", e)
+              }
+            }
+          }) 
+
+          def tick(a: Actor): Unit = {}
+          def shutdown: Unit = { threadPool.shutdown }
+          def onLockup(handler: () => Unit): Unit = {}
+          def onLockup(millis: Int)(handler: () => Unit): Unit = {}
+          def printActorDump: Unit = {}
+        }
+      }
+    }
+    isRegistered = true
+  }
+}
\ No newline at end of file
diff --git a/lib/jersey-client-1.1.0-ea.jar b/lib/jersey-client-1.1.0-ea.jar
new file mode 100644
index 0000000000..1950307c15
Binary files /dev/null and b/lib/jersey-client-1.1.0-ea.jar differ