asf - Revision 1400000: /lucene/dev/branches/fieldtype_conflicted/solr