Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into arm-port

Conflicts:
	glibc/glibc.nm
	gmp/gmp.nm

diff --cc glibc/glibc.nm
index 6d5d5bcca497bcb19438ad24d3a5340a041322b4,26a6d3b164e1e30297b9a69f918966b54f953262..efd031cd80deb3dce2cbfbc3a61c153226fee8d7
--- 1/glibc/glibc.nm
--- 2/glibc/glibc.nm
+++ b/glibc/glibc.nm
@@@ -3,11 -3,9 +3,9 @@@
  # Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
  ###############################################################################
  
- # TODO tzdata
- 
  name       = glibc
  version    = 2.14
 -release    = 4
 +release    = 5
  
  maintainer = Michael Tremer <michael.tremer@ipfire.org>
  groups     = System/Base