glorious funtoo updates

merged:

  funtoo-overlay: 0fd3bee71541aa54fb721296a1e4428e82c33310
  foo-overlay: 7d465f21ec9f45f44569f303afedcdd5750d1e16
  bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
  flora: cc31343a95ac9fd63bfc06fb6f27c86407f367fe
  for-gentoo: c8692cb39f31ff781c71c1db374045b412a92d1c
glorious funtoo updates

merged:

  funtoo-overlay: 3dd7e27649fceac1928082981549b7357d45a0c7
  foo-overlay: 7d465f21ec9f45f44569f303afedcdd5750d1e16
  bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
  flora: cc31343a95ac9fd63bfc06fb6f27c86407f367fe
  for-gentoo: 3bac1bc85489364fc1599d61a00f1e01db4fa3a9
glorious funtoo updates

merged:

  funtoo-overlay: 3dd7e27649fceac1928082981549b7357d45a0c7
  foo-overlay: 7d465f21ec9f45f44569f303afedcdd5750d1e16
  bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
  flora: cc31343a95ac9fd63bfc06fb6f27c86407f367fe
  for-gentoo: 90a346fdb07c92601014bec211919700045e0a76
Merge branch 'funtoo.org' of git://github.com/funtoo/ports-2012 into funtoo.org
Grand Fiordland Updates

Conflicts:
	profiles/package.mask/funtoo-staging