Patch from Jon Trowbridge <trow@ximian.com>: