I think that we can merge the lucene-4.0.0 branch back into the master, since tests and code are compiling. I haven't done any functional testing yet, but if much of the RPC and internals are going to change I think that it may be a waste of time to test and fix everything that we are about to change. What do others think?
Aaron
