Re-apply changes from revision 334.
Re-apply changes from revision 334.


git-svn-id: 237bb8501742362c87ecd662c39ec9b652d5e9c4@337 0ca392cc-ac01-46ed-af57-cd2466bdd565

syntheticpp/dirfile,syntheticpp/dirfile,syntheticpp/dirfile,syntheticpp/dirfile