From: Martin Zobel-Helas <zobel@debian.org>
Date: Sun, 20 Dec 2009 19:08:18 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=437bd93823b3c12cec48d2d584d21909e494b81e;hp=dde75bde7579c5593d5e0e094d21e7295e8102a7;p=mirror%2Fdsa-puppet.git

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

diff --git a/modules/named/files/common/named.conf.acl b/modules/named/files/common/named.conf.acl
index f04c9b870..42a63495a 100644
--- a/modules/named/files/common/named.conf.acl
+++ b/modules/named/files/common/named.conf.acl
@@ -73,6 +73,7 @@ acl AS {
 	country_AE;
 	country_AF;
 	country_AM;
+	country_AP; // global region Asia/Pacific
 	country_AZ;
 	country_BD;
 	country_BH;
@@ -141,6 +142,7 @@ acl EU {
 	country_DK;
 	country_EE;
 	country_ES;
+	country_EU; // global region Europe
 	country_FI;
 	country_FO;
 	country_FR;