Resolved conflicts with prior checkins in dlnasrc-101 branch.  Got rid of some of the comments which did not add any additional understanding.