Adding back in conf file.
authorBrian Aker <brian@tangent.org>
Fri, 22 Jul 2011 06:41:46 +0000 (23:41 -0700)
committerBrian Aker <brian@tangent.org>
Fri, 22 Jul 2011 06:41:46 +0000 (23:41 -0700)

Trivial merge