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:
  geo1 on squeeze
  unger on squeeze
  rietz on squeeze

diff --combined modules/debian-org/misc/local.yaml
index accedff74e048fc9b520d4384e29df40140bcf95,953f706230f176881b0db64ee09756adbf3add2c..672b4d8fcc683c2345451ef165aef4dc4fad860d
--- 1/modules/debian-org/misc/local.yaml
--- 2/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@@ -233,6 -233,7 +233,7 @@@ host_settings
      - fasch.debian.org
      - field.debian.org
      - finzi.debian.org
+     - geo1.debian.org
      - heininen.debian.org
      - kassia.debian.org
      - lamb.debian.org
@@@ -246,6 -247,7 +247,7 @@@
      - rautavaara.debian.org
      - reger.debian.org
      - rem.debian.org
+     - rietz.debian.org
      - rossini.debian.org
      - salieri.debian.org
      - santoro.debian.org
@@@ -255,6 -257,7 +257,7 @@@
      - spohr.debian.org
      - tchaikovsky.debian.org
      - traetta.debian.org
+     - unger.debian.org
    smarthost:
      abel.debian.org: mailout.debian.org
      agnesi.debian.org: mailout.debian.org
@@@ -380,7 -383,6 +383,7 @@@
      - heininen.debian.org
      - englund.debian.org
      - rautavaara.debian.org
 +    - salieri.debian.org
  #  reservedaddrs:
  #    ball.debian.org: "0.0.0.0/8 : 127.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5"
  ---