merge trunk: 1341933 through 1342428

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene4055@1342429 13f79535-47bb-0310-9956-ffa450edef68
tree: 41c9944ccdf018985be1d2812a1afce5c461b603
  1. dev-tools/
  2. lucene/
  3. solr/
  4. .gitignore
  5. .hgignore
  6. build.xml
  7. README.txt