Merge commit 'origin/template' into build
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)
commit4347cfec32eefb0208f06711d972c0687b1a447a
tree95d6824f422461b7fc6685335c8fdc3b6fbd09e8
parenta116da9c969c141b0bb6b574a4f0b425408faab8
parent3efd2f3ff6b490e947d45ec28925f35888ec6896
Merge commit 'origin/template' into build

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