Merge branch 'config_load_fix'
authorSteve Scaffidi <sscaffidi@gmail.com>
Thu, 25 Jun 2009 22:34:00 +0000 (18:34 -0400)
committerSteve Scaffidi <sscaffidi@gmail.com>
Thu, 25 Jun 2009 22:34:00 +0000 (18:34 -0400)
commitd6eeb6a0f9a7f9a2bd1f3b1ce451659e1780c2a0
tree107e7c420e4ff2081f070812c4e8819ec0a3688c
parentd897a508655008f19550fc68282c2ce99135a757
parent456e158d69d784e044a506a053a2ff671c67c1c9
Merge branch 'config_load_fix'