Merge the chrome_webkit_merge_branch back on to trunk. This brings us

up to webkit@36102.


git-svn-id: http://src.chromium.org/svn/trunk/src/build@2778 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

internal/essential.vsprops

@@ -30,7 +30,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalOptions="/safeseh /dynamicbase /ignore:4199 /ignore:4221 /nxcompat"
-		AdditionalDependencies="wininet.lib version.lib msimg32.lib ws2_32.lib usp10.lib psapi.lib"
+		AdditionalDependencies="wininet.lib version.lib msimg32.lib ws2_32.lib usp10.lib psapi.lib iphlpapi.lib"
 		AdditionalLibraryDirectories="$(SDKLibs)"
 		DelayLoadDLLs="dwmapi.dll,uxtheme.dll"
 		GenerateDebugInformation="true"