Merge remote-tracking branch 'cwarden/debian-squeeze-htmldir-fix' into master
-rw-r--r-- 3030 README
drwxr-xr-x - files
drwxr-xr-x - lib
drwxr-xr-x - manifests
drwxr-xr-x - templates