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