Merge alternate hangup and meetme patches from Matt N.