2004-01-26  David Carlton  <carlton@kealia.com>

	* Merge with mainline; tag is carlton_dictionary-20040126-merge.