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)
commit3f218a84ef15bd3360e9073d9fed0ab5ad7276a9
tree680e3ebf9d6c4a9b49c80e6f06cecaf0894643f8
parent8cef233192069bc795b67fe7d0f99dcce0c6821e
parent3efd2f3ff6b490e947d45ec28925f35888ec6896
Merge commit 'origin/template' into mysql

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