2.6.1: * Build fixes for gcc 3.4 and for the Intel compiler. (Takashi Takekawa)