glorious funtoo updates

merged:

  funtoo-overlay: 3125773d2b973c3a8e11af1a9b0e92e640f641cf
  foo-overlay: 4ee427c6573d50d9ce03f6671dce87274c57ee9f
  bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
  flora: cc31343a95ac9fd63bfc06fb6f27c86407f367fe
  for-gentoo: 9f12174c45b9fbd3e8b341c79ddfe98f7913fb39
glorious funtoo updates

merged:

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

Conflicts:
	profiles/package.mask/funtoo-staging