Merge branch 'master' of git://git.ipfire.org/ipfire-3.x

Conflicts:

	tools/make-constants

diff --cc lfs/Config
Simple merge

diff --cc tools/make-constants
index 477b2faac6b32bef662a65eb8a8c1f4551e7d4e8,3f3fc628113304b6fea107b26843903317c9bbd4..c9ca5066febe4a54a66824c1ba3e5909dadd367f
--- 1/tools/make-constants
--- 2/tools/make-constants
+++ b/tools/make-constants
@@@ -25,8 -25,8 +25,8 @@@
  ###############################################################################
  
  # Default target
- TARGET=i686
+ TARGET=${TARGET-i686}
 -POSSIBLE_TARGETS="i586 i686 via-c3 via-c7 geodelx"
 +POSSIBLE_TARGETS="i486 i586 i686 via-c3 via-c7 geodelx"
  
  # Configuration rootdir
  CONFIG_ROOT=/etc/$SNAME