Merge remote-tracking branch 'cwarden/debian-squeeze-htmldir-fix' into master