Merge branch 'config_load_fix'
Steve Scaffidi [Thu, 25 Jun 2009 22:34:00 +0000 (18:34 -0400)]

Trivial merge