Index: ext/libicpf/src/libicpf-tests/libicpf-tests.vc90.vcproj
===================================================================
diff -u -N -rbd13445ce92c71d7ffff0b43de28cc123d530bd3 -r920946dc579a1d007fb86ebbffcdf63505f4fb2a
--- ext/libicpf/src/libicpf-tests/libicpf-tests.vc90.vcproj	(.../libicpf-tests.vc90.vcproj)	(revision bd13445ce92c71d7ffff0b43de28cc123d530bd3)
+++ ext/libicpf/src/libicpf-tests/libicpf-tests.vc90.vcproj	(.../libicpf-tests.vc90.vcproj)	(revision 920946dc579a1d007fb86ebbffcdf63505f4fb2a)
@@ -22,7 +22,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)bin\debug"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -101,7 +101,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="$(SolutionDir)bin\debug"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -181,7 +181,7 @@
 		<Configuration
 			Name="Debug-Unicode|Win32"
 			OutputDirectory="$(SolutionDir)bin\debug"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="1"
@@ -260,7 +260,7 @@
 		<Configuration
 			Name="Debug-Unicode|x64"
 			OutputDirectory="$(SolutionDir)bin\debug"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="1"
@@ -340,7 +340,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)bin\release"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -418,7 +418,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="$(SolutionDir)bin\release"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -497,7 +497,7 @@
 		<Configuration
 			Name="Release-Unicode|Win32"
 			OutputDirectory="$(SolutionDir)bin\release"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="1"
@@ -575,7 +575,7 @@
 		<Configuration
 			Name="Release-Unicode|x64"
 			OutputDirectory="$(SolutionDir)bin\release"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="1"
Index: ext/libicpf/src/libicpf/libicpf.vc90.vcproj
===================================================================
diff -u -N -rbd13445ce92c71d7ffff0b43de28cc123d530bd3 -r920946dc579a1d007fb86ebbffcdf63505f4fb2a
--- ext/libicpf/src/libicpf/libicpf.vc90.vcproj	(.../libicpf.vc90.vcproj)	(revision bd13445ce92c71d7ffff0b43de28cc123d530bd3)
+++ ext/libicpf/src/libicpf/libicpf.vc90.vcproj	(.../libicpf.vc90.vcproj)	(revision 920946dc579a1d007fb86ebbffcdf63505f4fb2a)
@@ -22,7 +22,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)bin\debug"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -101,7 +101,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="$(SolutionDir)bin\debug"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -180,7 +180,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)bin\release"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -258,7 +258,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="$(SolutionDir)bin\release"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -337,7 +337,7 @@
 		<Configuration
 			Name="Debug-Unicode|Win32"
 			OutputDirectory="$(SolutionDir)bin\debug"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"
 			>
@@ -416,7 +416,7 @@
 		<Configuration
 			Name="Debug-Unicode|x64"
 			OutputDirectory="$(SolutionDir)bin\debug"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="1"
@@ -496,7 +496,7 @@
 		<Configuration
 			Name="Release-Unicode|Win32"
 			OutputDirectory="$(SolutionDir)bin\release"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"
 			>
@@ -574,7 +574,7 @@
 		<Configuration
 			Name="Release-Unicode|x64"
 			OutputDirectory="$(SolutionDir)bin\release"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="1"