Merge commit 'origin/template' into login
authorroot <root@drsnuggles.stderr.nl>
Tue, 5 May 2009 16:20:22 +0000 (18:20 +0200)
committerroot <root@drsnuggles.stderr.nl>
Tue, 5 May 2009 16:20:22 +0000 (18:20 +0200)
commit0fe1f1646a805dc2db2f80bf326516607884a9b1
tree3ea95f66abefe319ef764ba2fc4599deef6b1ffc
parentb5b6f15d7fb8b0305e61dc61e2be7f4d420cec08
parent3efd2f3ff6b490e947d45ec28925f35888ec6896
Merge commit 'origin/template' into login

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