git-svn-id: trunk@44081 - (cherry picked from commit 00214406bc) # Conflicts: # .gitattributes
00214406bc