Comment 5 for bug 857572

Pushed a new branch to the working repo: user/dbs/tpac_semantic_rebase_2011_09_30

This branch drops the MFHD commits that were already merged to master and resolves two conflicts that occurred with master due to commits since I last resolved conflicts on 2011-09-23.