glorious funtoo updates

merged:

  funtoo-overlay: 9e05ebdd303b40df6962cb88e2d525668ff67f11
  foo-overlay: 4cbf423d1bdc05854fd6edbbbb1b060933b91152
  bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
  flora: cc31343a95ac9fd63bfc06fb6f27c86407f367fe
  for-gentoo: add5cf1f3d34dfbd50b7ecc6c40de6cbcb103ced
Merge branch 'funtoo.org' of git://github.com/funtoo/ports-2012 into funtoo.org
Grand Fiordland Updates

Conflicts:
	profiles/package.mask/funtoo-staging