merge to 3.0

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/branches/lucene_3_0@883076 13f79535-47bb-0310-9956-ffa450edef68
6 files changed