[mountainlion-changes] trunk/config/include config.hh,1.5,1.6