FL-1501: adding gawk-4.1.1 with necessary changes (pulled from gentoo) for testing
FL-1502: adding gentoo's pciutils-3.2.1 ebuild. no changes except 'funtoo keywording' (same as previous version)
FL-1503: adding gentoo's dev-util/valgrind-3.9.0 with optional ssp
FL-1504: adding linux-headers 3.14, 3.15 and 3.16
FL-1418: new vzctl-4.7.2 with fixes for setting FQDN in Funtoo containers.
FL-1418: new vzctl-4.7.2 masked for testing.
Merge branch 'master' of git.funtoo.org:funtoo-overlay

Conflicts:
	profiles/package.mask/funtoo-staging
FL-1505: update merge.py for experimental branch - experimental will now merge funtoo toolchain overlay, so we can test it. In all other respects, experimental is now the same as mainline.
Hardened mix-in update
Hardened mix-in update (2/2)
Version bump net-misc/openvswitch-2.1.3
Version bump net-misc/openvswitch-2.3.0
FL-1508: updating icewm ebuild to 1.3.8 version. debian-gcc-compatibility-patch is not needed anymore. adding new uclibc patch (previous one was broken for new version)
FL-1509: ensure wifi is enabled by default in networkmanager
FL-1506: add xattr to core funtoo profile USE.
FL-1512: adding proper OSSv4 ebuild. masking older versions due to broken state. main/current ebuild masked for testing. might have issues because upstream expect system to have alsa instead of oss
FL-1513: adding funtoo-wmfs overlay synchronization with the main tree
FL-1418: unmasking vzctl-4.7.2.
unmasking =x11-wm/icewm-1.3.8 =dev-util/valgrind-3.9.0 =sys-apps/gawk-4.1.1 =sys-apps/pciutils-3.2.1 =sys-kernel/linux-headers-3.14 =sys-kernel/linux-headers-3.15 =sys-kernel/linux-headers-3.16
FL-1520: adding xsettingsd ebuilds