Modify icu's stringpiece.cpp like Chromium, to enable building in VS2010 and VS2012.
diff --git a/README.pagespeed b/README.pagespeed
index 169c144..e2e2eab 100644
--- a/README.pagespeed
+++ b/README.pagespeed
@@ -5,10 +5,13 @@
 License File: license.html
 
 Description:
-This directory contains the source code of ICU 4.6.1 for C/C++. Based
-on ICU code from Chromium's repository. See Chromium's ICU
-README.chromium file for details on Chromium modifications to the ICU
-library.
+This directory contains the source code of ICU 4.6.1 for C/C++.
+
+Local Modifiations:
+1. Modified stringpiece.cpp to disable StringPiece::npos in Visual
+   Studio 2010 and 2012, which is required in order to build in those
+   environments. Chromium made the same change to their
+   stringpiece.cpp.
 
 Page Speed uses ICU to enable IDN
 (http://en.wikipedia.org/wiki/Internationalized_domain_name) support
diff --git a/source/common/stringpiece.cpp b/source/common/stringpiece.cpp
index 64cd376..de98d3d 100644
--- a/source/common/stringpiece.cpp
+++ b/source/common/stringpiece.cpp
@@ -75,7 +75,7 @@
  * Visual Studios 9.0.
  * Cygwin with MSVC 9.0 also complains here about redefinition.
  */
-#if (!defined(_MSC_VER) || (_MSC_VER > 1500)) && !defined(CYGWINMSVC)
+#if (!defined(_MSC_VER) || (_MSC_VER > 1700)) && !defined(CYGWINMSVC)
 const int32_t StringPiece::npos;
 #endif