tree b4872b0bd2ff8cc53d9950c0b78c20f579793f4e
parent b33ec2619225c8c039625b1d53f3f6889dc155b4
parent 9f2affb665a669ba37628019d950ed3453c90e10
author Robert Muir <rmuir@apache.org> 1304074996 +0000
committer Robert Muir <rmuir@apache.org> 1304074996 +0000

merge trunk (1097442:1097764)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/realtime_search@1097767 13f79535-47bb-0310-9956-ffa450edef68