Merge branch 'master' into ubuntu-master

Conflicts:

	cron.d/100syncarchive
	cron.d/300maintainerdb
	templates/config.tmpl
	templates/config/mirrors.tmpl

diff --cc templates/config.tmpl
index 451b0e60ff668c10c2acc1863274302ab129ff83,294d8f0a1ee8a3b3e764facbc44473621230f23a..9b71c474e604e39f24fd2e9f39d5465d501645b9
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -52,7 -51,7 +52,7 @@@
  [%-
     # possible values for importance: high, normal, low
     sitewidemsg = { importance => "high",
-                  txt => g('Please note that this is an experimental version of <a href="http://packages.ubuntu.com/">packages.ubuntu.com</a>. Errors and obsolete information should be expected') }
 -                 txt => g('Please note that this is an experimental version of <a href="http://%s/">%s</a>. Errors and obsolete information should be expected', 'packages.debian.org', 'packages.debian.org') }
++                 txt => g('Please note that this is an experimental version of <a href="http://%s/">%s</a>. Errors and obsolete information should be expected', 'packages.ubuntu.com', 'packages.ubuntu.com') }
  -%]
  [%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
  [%- USE num = Number.Format( decimal_point => g('.'),