Merge branch 'master' into debian-master

diff --combined templates/config/mirrors.tmpl
index 510eb7e4685d7ebdb662753eb716da2d7e315458,3df5af35845a5654193ada3756268dcbdfecbfcd..85f478e87a5b209d5ab24ccf696eff588549464f
--- 1/templates/config/mirrors.tmpl
--- 2/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@@ -44,12 -44,12 +44,12 @@@ mirrors = 
                        "ftp.it.debian.org/debian",
                        "ftp.lt.debian.org/debian",
                        "ftp.nl.debian.org/debian",
- #only some arches     "ftp.no.debian.org/debian",
+                       "ftp.no.debian.org/debian",
                        "ftp.pl.debian.org/debian",
                        "ftp.ro.debian.org/debian",
                        "ftp.ru.debian.org/debian",
                        "ftp.se.debian.org/debian",
- #only some arches     "ftp.si.debian.org/debian",
+                       "ftp.si.debian.org/debian",
                        "ftp.tr.debian.org/debian",
                        "ftp.uk.debian.org/debian",
                ],
@@@ -70,10 -70,10 +70,10 @@@
                        "mirror.optus.net/debian",
                ],
                asia => [
+                       "ftp.cn.debian.org/debian",
                        "ftp.jp.debian.org/debian",
-                       "ftp2.jp.debian.org/debian",
                        "ftp.kr.debian.org/debian",
- #only some arches     "ftp.hk.debian.org/debian",
+                       "ftp.hk.debian.org/debian",
                        "ftp.tw.debian.org/debian",
                        "debian.nctu.edu.tw/debian",
                        "debian.linux.org.tw/debian",
@@@ -134,7 -134,7 +134,7 @@@
        backports => {
                url => 'http://backports.debian.org/',
                title => g('newer packages that have been adapted to stable releases of Debian'),
 -              mirror_list => 'http://www.backports.org/debian/README.mirrors.html',
 +              mirror_list => 'http://backports.debian.org/Mirrors/',
                europa => [
                        "backports.debian.org/debian-backports",
                        "ftp.at.debian.org/debian-backports/",
@@@ -171,10 -171,6 +171,10 @@@
                                url => 'http://avr32.debian.net/',
                                name => 'AVR32',
                        },
 +                      armhf => {
 +                              url => 'http://wiki.debian.org/ArmHardFloatPort',
 +                              name => 'ARMHF',
 +                      },
                        hppa => {
                                url_name => 'hppa',
                                name => 'HPPA',