Clarify comment and variable name.  Fix an issue introduced in r39365 where the TH1::AddDirectory was not restored after a merge if it been turned off by the user
Clarify comment and variable name.  Fix an issue introduced in r39365 where the TH1::AddDirectory was not restored after a merge if it been turned off by the user


git-svn-id: acec3fd5b7ea1eb9e79d6329d318e8118ee2e14f@41388 27541ba8-7e3a-0410-8455-c3a389f83636

bbockelm/root-historical,bbockelm/root-historical,bbockelm/root-historical,bbockelm/root-historical,bbockelm/root-historical,bbockelm/root-historical,bbockelm/root-historical