Merge commit 'origin/master' into debian-master

Conflicts:

	config.sh.sed.in

diff --cc config.sh.sed.in
index f0ee0c7b194712866b4fa81ca060019c47466d33,e1ac8c78edb0f1237314946cacb744008a3bdd12..a6d9b78123c2e6c3db5739846f1e28654f414b28
--- 1/config.sh.sed.in
--- 2/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -37,9 -37,8 +37,9 @@@ root="
  
  # Architectures
  #
- polangs="de fi fr hu nl uk"
 -polangs="de fi fr hu ja nl uk"
 -ddtplangs="ca cs da de eo es fi fr go hu it ja km_KH ko nl pl pt pt_BR ru sk sv uk zh zh_CN zh_TW"
++polangs="de fi fr ja hu nl uk"
 +ddtplangs="ca cs da de eo es fi fr go hu it ja km_KH ko nl pl pt pt_BR ru sk sv uk"
 +#ddtplangs="ca cs da de eo es fi fr go hu it ja km_KH ko nl pl pt pt_BR ru sk sv uk zh zh_CN zh_TW"
  archives="us security amd64 gnuab backports volatile"
  sections="main contrib non-free"
  parts="$sections"