glorious funtoo updates

merged:

  funtoo-overlay: 0d876f5a350a8fefc16bea5436a7b64652f58bbd
  foo-overlay: 4cbf423d1bdc05854fd6edbbbb1b060933b91152
  bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
  flora: cc31343a95ac9fd63bfc06fb6f27c86407f367fe
  for-gentoo: 941098fd22479c9e5a8905e35a58b461cf3e5411
glorious funtoo updates

merged:

  funtoo-overlay: 88aaf75ab4cd1ae9c8eba708a2bf054aa7a5a67d
  foo-overlay: 4cbf423d1bdc05854fd6edbbbb1b060933b91152
  bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
  flora: cc31343a95ac9fd63bfc06fb6f27c86407f367fe
  for-gentoo: 941098fd22479c9e5a8905e35a58b461cf3e5411
glorious funtoo updates

merged:

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

merged:

  funtoo-overlay: 0fd3bee71541aa54fb721296a1e4428e82c33310
  foo-overlay: 7d465f21ec9f45f44569f303afedcdd5750d1e16
  bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
  flora: cc31343a95ac9fd63bfc06fb6f27c86407f367fe
  for-gentoo: c8692cb39f31ff781c71c1db374045b412a92d1c
Merge branch 'funtoo.org' of git://github.com/funtoo/ports-2012 into funtoo.org

Conflicts:
	profiles/package.mask/funtoo-cautionary