Applying patch for 25ns Dec 2012 runs
Merge pull request #5047 from dabelknap/config_dec2012

Applying patch for 25ns Dec 2012 runs