Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Sun, 6 Sep 2009 18:11:03 +0000 (20:11 +0200)
committerPeter Palfrader <peter@palfrader.org>
Sun, 6 Sep 2009 18:11:03 +0000 (20:11 +0200)
* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  apache is weird
  Oh puppet, you are so picky
  Make rlimitmem host dependent
  Make ressource-limits a template


Trivial merge