Merge commit 'origin/template' into login
authorroot <root@login.drsnuggles.stderr.nl>
Tue, 3 Aug 2010 15:15:32 +0000 (17:15 +0200)
committerroot <root@login.drsnuggles.stderr.nl>
Tue, 3 Aug 2010 15:15:32 +0000 (17:15 +0200)
* commit 'origin/template':
  oidentd: Allow the vserver host to forward connections.
  oidentd: Add default configuration.


Trivial merge