Remove unneeded code.
Merge branch 'master' of github.com:flavioc/meld

Conflicts:
	db/trie.cpp