move StateTimeout into Fsm

akka-core/src/main/scala/actor/Fsm.scala

@@ -34,5 +34,5 @@ trait Fsm[S] { self: Actor =>
 
   case class NextState(state: State, stateData: S, timeout: Option[Int] = None)
   case class Event(event: Any, stateData: S)
+  object StateTimeout
 }
-object StateTimeout

akka-core/src/test/scala/FsmActorSpec.scala

@@ -7,7 +7,7 @@ package se.scalablesolutions.akka.actor
 import org.scalatest.junit.JUnitSuite
 import org.junit.Test
 import org.multiverse.api.latches.StandardLatch
-import actor.{StateTimeout, Fsm}
+import actor.Fsm
 import java.util.concurrent.TimeUnit
 
 object FsmActorSpec {