Merge branch 'next' into temp-c168-development

diff --cc config/rootfiles/oldcore/167/filelists/elinks
index 0000000000000000000000000000000000000000,10db4dd8f7d3645c39673d9752b97d6908840cf2..10db4dd8f7d3645c39673d9752b97d6908840cf2
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/167/filelists/elinks
+++ b/config/rootfiles/oldcore/167/filelists/elinks

diff --cc config/rootfiles/oldcore/167/filelists/files
Simple merge

diff --cc config/rootfiles/oldcore/167/filelists/libloc
index 0000000000000000000000000000000000000000,ff4a92429cb2937f76a27003ed1fe1ee80479bbc..ff4a92429cb2937f76a27003ed1fe1ee80479bbc
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/167/filelists/libloc
+++ b/config/rootfiles/oldcore/167/filelists/libloc

diff --cc config/rootfiles/oldcore/167/filelists/vnstat
index 0000000000000000000000000000000000000000,2e2e6100bf3ba2cf66fa0637af202d2bfc7aa656..2e2e6100bf3ba2cf66fa0637af202d2bfc7aa656
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/167/filelists/vnstat
+++ b/config/rootfiles/oldcore/167/filelists/vnstat

diff --cc config/rootfiles/oldcore/167/filelists/xz
index 0000000000000000000000000000000000000000,734e926c7e981e31d3256bcbf21ae3920cd6c577..734e926c7e981e31d3256bcbf21ae3920cd6c577
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/167/filelists/xz
+++ b/config/rootfiles/oldcore/167/filelists/xz

diff --cc config/rootfiles/oldcore/167/update.sh
Simple merge