Merge branch 'birdcage-scala29' into scala29

Conflicts:
	project/build.properties
	project/release.properties
	project/versions.properties

project/build.properties

@@ -1,8 +1,8 @@
 #Project properties
-#Mon Feb 13 15:54:31 PST 2012
+#Mon Feb 13 15:56:46 PST 2012
 project.organization=com.twitter
-project.name=ostrich
+project.name=ostrich_2.9.1
 sbt.version=0.7.4
 project.version=4.10.6-SNAPSHOT
-build.scala.versions=2.8.1
+build.scala.versions=2.9.1
 project.initialize=false

project/build/OstrichProject.scala

@@ -11,15 +11,15 @@ class OstrichProject(info: ProjectInfo) extends StandardLibraryProject(info)
   with PublishSite
 {
   projectDependencies(
-    "util"     ~ "util-core",
-    "util"     ~ "util-eval",
-    "util"     ~ "util-logging"
+    "util"     ~ "util-core_2.9.1",
+    "util"     ~ "util-eval_2.9.1",
+    "util"     ~ "util-logging_2.9.1"
   )
 
   val json = "com.twitter" % "json_2.8.1" % "2.1.6"
 
   // for tests:
-  val specs = "org.scala-tools.testing" % "specs_2.8.1" % "1.6.6" % "test"
+  val specs = "org.scala-tools.testing" % "specs_2.9.1" % "1.6.9" % "test"
   val cglib = "cglib" % "cglib" % "2.1_3" % "test"
   val asm = "asm" % "asm" % "1.5.3" % "test"
   val objenesis = "org.objenesis" % "objenesis" % "1.1" % "test"

project/release.properties

@@ -1,4 +1,4 @@
 #Automatically generated by ReleaseManagement
-#Mon Feb 13 15:54:31 PST 2012
+#Mon Feb 13 15:56:46 PST 2012
 version=4.10.5
-sha1=d02a62e0bb20dd6f6384fe7f8839f31b14538984
+sha1=40604dc36692a961f350cd442128523e5a0366f1

project/versions.properties

@@ -1,8 +1,14 @@
 #Automatically generated by ProjectDependencies
-#Mon Feb 13 15:52:58 PST 2012
-com.twitter/util-core=1.12.13
+#Mon Feb 13 15:54:54 PST 2012
+com.twitter/util-core_2.9.1=1.12.13
+com.twitter/util-core=1.12.12
 util|util-eval=com.twitter/util-eval
-com.twitter/util-eval=1.12.13
+util|util-core_2.9.1=com.twitter/util-core_2.9.1
 util|util-logging=com.twitter/util-logging
-com.twitter/util-logging=1.12.13
+com.twitter/util-logging=1.12.12
 util|util-core=com.twitter/util-core
+util|util-logging_2.9.1=com.twitter/util-logging_2.9.1
+com.twitter/util-eval=1.12.7
+com.twitter/util-logging_2.9.1=1.12.13
+com.twitter/util-eval_2.9.1=1.12.13
+util|util-eval_2.9.1=com.twitter/util-eval_2.9.1