Changeset 7967: NFA Branch Merged into Trunk

I and a host of other folks have been waiting anxiously for this merge for a while now. Excited to see it happen tonight.

Good job, Brian Rosner et al.