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

Conflicts:
	gcc/gcc.nm

diff --cc gcc/gcc.nm
index 6bafedef544b23a29ea54853a0ff646af060e617,c650b71946ca23913c50bd806f8b9afc15c80971..7ec6485e4b61335eb726dbf57316cc1af67d18b2
--- 1/gcc/gcc.nm
--- 2/gcc/gcc.nm
+++ b/gcc/gcc.nm
@@@ -8,7 -8,7 +8,7 @@@ build_cloog_ppl = 
  
  name       = gcc
  version    = 4.6.2
- release    = 5
 -release    = 6
++release    = 7
  
  maintainer = Michael Tremer <michael.tremer@ipfire.org>
  groups     = Development/Compilers