All,
I've taken the ill-fated merge attempt from a few weeks ago and have reworked it into 16 smaller, logical patches. I've also made certain that in the end, when all patches are applied all of the touched boards will build.
Each patch I submit will consist of a brief description of what was changed and why, as well as a diffstat and the patch itself.
I'll start submitting the diffs for review.
--jason--