Merged solr4 branch into master

I've merged the solr4 branch into the master branch in my fork. The ant tests pass, and both the browse-indexer and browse-handler worked just fine on my dev box.