modified:   api/trie.cc
	modified:   examples/simpleexpand.cc
Merge branch 'master' of https://github.com/sidmutha/xapian

Conflicts:
	xapian-core/api/trie.cc

	modified:   api/synonymexpansion.cc
	new file:   common/stop_words.txt
	new file:   common/wordnet/wn.h
	modified:   include/xapian/queryparser.h
	deleted:    logs/d2088315-116d-4796-9185-633ec9dd8885
Trie with frequency added