Merge remote-tracking branch 'cwarden/debian-squeeze-htmldir-fix' into master
authormh <mh@immerda.ch>
Tue, 10 Apr 2012 12:58:55 +0000 (14:58 +0200)
committermh <mh@immerda.ch>
Tue, 10 Apr 2012 12:59:45 +0000 (14:59 +0200)
Pull Request #4
Conflicts:
manifests/host.pp


Trivial merge