Index: lib/lucene-core-3.1-dev.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: lib/lucene-fast-vector-highlighter-3.1-dev.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: lib/lucene-misc-3.1-dev.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: lib/lucene-spatial-3.1-dev.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: lib/lucene-highlighter-3.1-dev.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: lib/lucene-spellchecker-3.1-dev.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: lib/lucene-analyzers-3.1-dev.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: lib/lucene-memory-3.1-dev.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: lib/lucene-queries-3.1-dev.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: src/test/org/apache/solr/search/TestDocSet.java
===================================================================
--- src/test/org/apache/solr/search/TestDocSet.java	(revision 923033)
+++ src/test/org/apache/solr/search/TestDocSet.java	(working copy)
@@ -355,7 +355,7 @@
     return r;
   }
 
-  public IndexReader dummyMultiReader(int nSeg, int maxDoc) {
+  public IndexReader dummyMultiReader(int nSeg, int maxDoc) throws IOException {
     if (nSeg==1 && rand.nextBoolean()) return dummyIndexReader(rand.nextInt(maxDoc));
 
     IndexReader[] subs = new IndexReader[rand.nextInt(nSeg)+1];
Index: src/java/org/apache/solr/response/PHPSerializedResponseWriter.java
===================================================================
--- src/java/org/apache/solr/response/PHPSerializedResponseWriter.java	(revision 923033)
+++ src/java/org/apache/solr/response/PHPSerializedResponseWriter.java	(working copy)
@@ -23,6 +23,7 @@
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Fieldable;
+import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.UnicodeUtil;
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.util.NamedList;
@@ -80,12 +81,12 @@
 
 class PHPSerializedWriter extends JSONWriter {
   final private boolean CESU8;
-  final UnicodeUtil.UTF8Result utf8;
+  final BytesRef utf8;
 
   public PHPSerializedWriter(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp, boolean CESU8) {
     super(writer, req, rsp);
     this.CESU8 = CESU8;
-    this.utf8 = CESU8 ? null : new UnicodeUtil.UTF8Result();
+    this.utf8 = CESU8 ? null : new BytesRef(10);
     // never indent serialized PHP data
     doIndent = false;
   }