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

diff --cc lfs/glib2
index bc0241d3fa896503ee2c9e37f30f3cf8a4880e27,7c6679e5af33c3df85b086ef90b35a6e7efdb181..bf21f2e8608625990d5e7ce97e22ae6e38f9d905
--- 1/lfs/glib2
--- 2/lfs/glib2
+++ b/lfs/glib2
@@@ -35,10 -35,10 +35,10 @@@ DIR_APP    = $(DIR_SRC)/$(THISAPP
  OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
  
  MAINTAINER =
 -GROUP      = System/Libaries
 +GROUP      = System/Libraries
  EXTRA      = no
  DEBUG      = no
- DEPS       = pkg-config
+ DEPS       = pcre pkg-config
  
  URL        = http://www.gtk.org
  LICENSE    = LGPLv2+

diff --cc make.sh
index 808b8dc4a8999c9803e9d03cb889844a69ced367,4c2be7e06fbacee324fe19b3e332debe599b1f52..164a66094965f566d376a9e15eff35ebf6e38c68
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -321,10 -321,7 +322,9 @@@ ipfire_build() 
        ipfire_make cpio
        ipfire_make cdrtools
        ipfire_make python-parted
 +      ipfire_make python-pyblock
 +      ipfire_make libbdevid
        ipfire_make memtest86+
-       #ipfire_make pakfire
        ipfire_make quagga
        #ipfire_make mISDN
        #ipfire_make wireless