Log Message:
Correct XCOMPMGR_DEFS defines in Makefile to reflect reality, and comment
them out as we'll go with the defaults for now.  Also, add a patch
from GIT to fix a resource leak.  Bump rev.