Merge branch 'master' into next Conflicts: config/kernel/kernel.config.i586-ipfire-pae config/rootfiles/core/45/meta config/rootfiles/core/46/meta config/rootfiles/core/47/meta config/rootfiles/core/48/meta config/rootfiles/core/52/meta config/rootfiles/oldcore/44/meta config/rootfiles/oldcore/45/meta config/rootfiles/oldcore/46/meta config/rootfiles/oldcore/47/meta doc/language_missings langs/pl/cgi-bin/pl.pl make.sh