Merge commit 'origin/template' into dns
authorroot <root@drsnuggles.stderr.nl>
Tue, 5 May 2009 16:20:21 +0000 (18:20 +0200)
committerroot <root@drsnuggles.stderr.nl>
Tue, 5 May 2009 16:20:21 +0000 (18:20 +0200)
commit491c49b2acf6a74d020efc5aa2e4443e95471640
tree827a8e4ef32d1b2474a712887cb66b9a7715f9a9
parent58d5d6e20c45c4affee86ac6b43700c8b8fa524d
parent3efd2f3ff6b490e947d45ec28925f35888ec6896
Merge commit 'origin/template' into dns

* commit 'origin/template':
  rsyslog: Use another format for forwarding messages.
  ssh: Disable changing of the oom_adj value.
  ssh: Add default initscript configuration.