Merge commit 'alioth/master' into debian-master

Conflicts:

	config.sh.sed.in
	debian/control
	lib/Packages/Dispatcher.pm

diff --cc config.sh.sed.in
Simple merge

diff --cc debian/control
index 3cc7ffb1d93fbbd47e2e619fb9c1a0b25d768b81,03c841a2fd969cc59182ce3a0085d96f7b90d407..840b4f73567d129b3c936eeb394aad003cbed156
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,6 -1,6 +1,6 @@@
  Source: packages
 -Build-Depends: git-core, rsync, dpkg-dev, procmail,
 +Build-Depends: rsync, dpkg-dev, procmail,
-  gettext, liblocale-gettext-perl, locales | locales-all, libi18n-acceptlanguage-perl,
+  liblocale-maketext-lexicon-perl, libi18n-acceptlanguage-perl, libnumber-format-perl,
   libcompress-zlib-perl, libhtml-parser-perl, libio-stringy-perl,
   libmldbm-perl, libtext-iconv-perl, libhtml-template-perl,
   libclass-accessor-perl, liburi-perl, libxml-rss-perl, libtemplate-perl,

diff --cc templates/config.tmpl
index 86e7cc958d7feb88581df45ebd1ba66d7d994aad,1fee16b8b4a0245fc268afb4c50235cb96b5b32f..26827e4fbee339a731e8a8d872727cc7adf2b3af
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -49,7 -49,10 +49,11 @@@
  -%]
  [%-
     # 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.debian.org/">packages.debian.org</a>. Errors and obsolete information should be expected') }
 +#   sitewidemsg = { importance => "high",
 +#                txt => g('Please note that this is an experimental version of <a href="http://packages.debian.org/">packages.debian.org</a>. Errors and obsolete information should be expected') }
 +#                txt => "Site maintainance in progress, some temporary problems might occour." }
  -%]
+ [%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
+ [%- USE num = Number.Format( decimal_point => g('.'),
+                            thousands_sep => g(','),
+                            decimal_fill  => 1 ) -%]