Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  no more afs stuff
  antheil → squeeze
  agricola, abel → squeeze
  arcadelt → squeeze
  Hard code merikanto and orff's IPs for NAT-ed hosts
  Add virt_aliases_regex router
  Strip [] out of the RT tag too