Microsoft and Sun Patch Things Up