[gentoo-catalyst] master rebase of catalyst 2

[William Hubbs]

All,

I checked out a local branch from master earlier today and rebased that
on catalyst_2. Now that branch has over 100 commits, which will be the
combination of everything on catilyst 2 and current master.

So, how would you suggest we get that branch back out where everyone can
see it? Do you want me to put it back out on master? It won't be a
forced update, because I used rebase instead of merge.

The only catch is I don't know how broken that will leave master.

What are your thoughts?

William