Merge commit 'origin/template' into mysql
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)
* commit 'origin/template':
  rsyslog: Use another format for forwarding messages.
  ssh: Disable changing of the oom_adj value.
  ssh: Add default initscript configuration.


Trivial merge