all in
ignore nothing
Merge branch 'corei7-avx' of github.com:jlec/portage-env into leo

* 'corei7-avx' of github.com:jlec/portage-env:
  ignore nothing
  all in

* corei7-avx:
  ignore nothing
  all in

Conflicts:
	env/O3-notmpfs.conf
	env/notmpfs.conf
	make.conf
	make.conf.old
	make.profile
	package.env
	profile/use.mask
	savedconfig/sys-apps/busybox-1.21.0

Signed-off-by: Justin Lecher <jlec@gentoo.org>
Cleaned package.env