diff -ruN boost_1_50_0/libs/locale/build/Jamfile.v2 boost_1_50_0-patched/libs/locale/build/Jamfile.v2
--- boost_1_50_0/libs/locale/build/Jamfile.v2	2012-05-23 14:39:25 -0300
+++ boost_1_50_0-patched/libs/locale/build/Jamfile.v2	2012-08-02 16:29:30 -0300
@@ -52,134 +52,138 @@
                                 <linkflags>-shared-libgcc
                             ;
 
+local disable-icu = [ MATCH (--disable-icu) : [ modules.peek : ARGV ] ] ;
 
 ICU_PATH =  [ modules.peek : ICU_PATH ] ;
 ICU_LINK =  [ modules.peek : ICU_LINK ] ;
 
-if $(ICU_LINK)
+if ! $(disable-icu)
 {
-    ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <runtime-link>shared ;
-    ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin64 <runtime-link>shared ;
-}
-else
-{
-    searched-lib icuuc : :  <name>icuuc
-                            <search>$(ICU_PATH)/lib 
-                            <link>shared 
-                            <runtime-link>shared ;
-
-    searched-lib icuuc : :  <toolset>msvc
-                            <variant>debug
-                            <name>icuucd
-                            <search>$(ICU_PATH)/lib
-                            <link>shared
-                            <runtime-link>shared ;
-
-    searched-lib icuuc : :  <name>this_is_an_invalid_library_name ;
-
-    searched-lib icudt : :  <search>$(ICU_PATH)/lib
-                            <name>icudata
-                            <link>shared
-                            <runtime-link>shared ;
-
-    searched-lib icudt : :  <search>$(ICU_PATH)/lib
-                            <name>icudt
-                            <toolset>msvc
-                            <link>shared
-                            <runtime-link>shared ;
-
-    searched-lib icudt : :  <name>this_is_an_invalid_library_name ;
-
-    searched-lib icuin : :  <search>$(ICU_PATH)/lib
-                            <name>icui18n
-                            <link>shared
-                            <runtime-link>shared ;
-
-    searched-lib icuin : :  <toolset>msvc
-                            <variant>debug
-                            <name>icuind
-                            <search>$(ICU_PATH)/lib
-                            <link>shared
-                            <runtime-link>shared ;
-
-    searched-lib icuin : :  <toolset>msvc
-                            <variant>release
-                            <name>icuin
-                            <search>$(ICU_PATH)/lib
-                            <link>shared
-                            <runtime-link>shared ;
-
-    searched-lib icuin : :  <name>this_is_an_invalid_library_name ;
-
-    explicit icuuc icudt icuin ;
-
-    ICU_OPTS =   <include>$(ICU_PATH)/include 
-      <library>icuuc/<link>shared/<runtime-link>shared 
-      <library>icudt/<link>shared/<runtime-link>shared 
-      <library>icuin/<link>shared/<runtime-link>shared
-      <dll-path>$(ICU_PATH)/bin
-        <runtime-link>shared ;
-
-
-
-    searched-lib icuuc_64 : :   <name>icuuc
-                                <search>$(ICU_PATH)/lib64 
-                                <link>shared 
-                                <runtime-link>shared ;
-
-    searched-lib icuuc_64 : :   <toolset>msvc
-                                <variant>debug
-                                <name>icuucd
-                                <search>$(ICU_PATH)/lib64
-                                <link>shared
-                                <runtime-link>shared ;
-
-    searched-lib icuuc_64 : :   <name>this_is_an_invalid_library_name ;
-
-    searched-lib icudt_64 : :   <search>$(ICU_PATH)/lib64
-                                <name>icudata
-                                <link>shared
-                                <runtime-link>shared ;
-
-    searched-lib icudt_64 : :   <search>$(ICU_PATH)/lib64
-                                <name>icudt
-                                <toolset>msvc
-                                <link>shared
-                                <runtime-link>shared ;
-
-    searched-lib icudt_64 : :   <name>this_is_an_invalid_library_name ;
-
-    searched-lib icuin_64 : :   <search>$(ICU_PATH)/lib64
-                                <name>icui18n
-                                <link>shared
-                                <runtime-link>shared ;
-
-    searched-lib icuin_64 : :   <toolset>msvc
-                                <variant>debug
-                                <name>icuind
-                                <search>$(ICU_PATH)/lib64
-                                <link>shared
-                                <runtime-link>shared ;
-
-    searched-lib icuin_64 : :   <toolset>msvc
-                                <variant>release
-                                <name>icuin
-                                <search>$(ICU_PATH)/lib64
-                                <link>shared
-                                <runtime-link>shared ;
-
-    searched-lib icuin_64 : :   <name>this_is_an_invalid_library_name ;
-
-    explicit icuuc_64 icudt_64 icuin_64 ;
-
-    ICU64_OPTS =   <include>$(ICU_PATH)/include 
-      <library>icuuc_64/<link>shared/<runtime-link>shared 
-      <library>icudt_64/<link>shared/<runtime-link>shared 
-      <library>icuin_64/<link>shared/<runtime-link>shared
-      <dll-path>$(ICU_PATH)/bin64
-        <runtime-link>shared ;
- 
-    
+  if $(ICU_LINK)
+  {
+      ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <runtime-link>shared ;
+      ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin64 <runtime-link>shared ;
+  }
+  else
+  {
+      searched-lib icuuc : :  <name>icuuc
+                              <search>$(ICU_PATH)/lib 
+                              <link>shared 
+                              <runtime-link>shared ;
+
+      searched-lib icuuc : :  <toolset>msvc
+                              <variant>debug
+                              <name>icuucd
+                              <search>$(ICU_PATH)/lib
+                              <link>shared
+                              <runtime-link>shared ;
+
+      searched-lib icuuc : :  <name>this_is_an_invalid_library_name ;
+
+      searched-lib icudt : :  <search>$(ICU_PATH)/lib
+                              <name>icudata
+                              <link>shared
+                              <runtime-link>shared ;
+
+      searched-lib icudt : :  <search>$(ICU_PATH)/lib
+                              <name>icudt
+                              <toolset>msvc
+                              <link>shared
+                              <runtime-link>shared ;
+
+      searched-lib icudt : :  <name>this_is_an_invalid_library_name ;
+
+      searched-lib icuin : :  <search>$(ICU_PATH)/lib
+                              <name>icui18n
+                              <link>shared
+                              <runtime-link>shared ;
+
+      searched-lib icuin : :  <toolset>msvc
+                              <variant>debug
+                              <name>icuind
+                              <search>$(ICU_PATH)/lib
+                              <link>shared
+                              <runtime-link>shared ;
+
+      searched-lib icuin : :  <toolset>msvc
+                              <variant>release
+                              <name>icuin
+                              <search>$(ICU_PATH)/lib
+                              <link>shared
+                              <runtime-link>shared ;
+
+      searched-lib icuin : :  <name>this_is_an_invalid_library_name ;
+
+      explicit icuuc icudt icuin ;
+
+      ICU_OPTS =   <include>$(ICU_PATH)/include 
+        <library>icuuc/<link>shared/<runtime-link>shared 
+        <library>icudt/<link>shared/<runtime-link>shared 
+        <library>icuin/<link>shared/<runtime-link>shared
+        <dll-path>$(ICU_PATH)/bin
+          <runtime-link>shared ;
+
+
+
+      searched-lib icuuc_64 : :   <name>icuuc
+                                  <search>$(ICU_PATH)/lib64 
+                                  <link>shared 
+                                  <runtime-link>shared ;
+
+      searched-lib icuuc_64 : :   <toolset>msvc
+                                  <variant>debug
+                                  <name>icuucd
+                                  <search>$(ICU_PATH)/lib64
+                                  <link>shared
+                                  <runtime-link>shared ;
+
+      searched-lib icuuc_64 : :   <name>this_is_an_invalid_library_name ;
+
+      searched-lib icudt_64 : :   <search>$(ICU_PATH)/lib64
+                                  <name>icudata
+                                  <link>shared
+                                  <runtime-link>shared ;
+
+      searched-lib icudt_64 : :   <search>$(ICU_PATH)/lib64
+                                  <name>icudt
+                                  <toolset>msvc
+                                  <link>shared
+                                  <runtime-link>shared ;
+
+      searched-lib icudt_64 : :   <name>this_is_an_invalid_library_name ;
+
+      searched-lib icuin_64 : :   <search>$(ICU_PATH)/lib64
+                                  <name>icui18n
+                                  <link>shared
+                                  <runtime-link>shared ;
+
+      searched-lib icuin_64 : :   <toolset>msvc
+                                  <variant>debug
+                                  <name>icuind
+                                  <search>$(ICU_PATH)/lib64
+                                  <link>shared
+                                  <runtime-link>shared ;
+
+      searched-lib icuin_64 : :   <toolset>msvc
+                                  <variant>release
+                                  <name>icuin
+                                  <search>$(ICU_PATH)/lib64
+                                  <link>shared
+                                  <runtime-link>shared ;
+
+      searched-lib icuin_64 : :   <name>this_is_an_invalid_library_name ;
+
+      explicit icuuc_64 icudt_64 icuin_64 ;
+
+      ICU64_OPTS =   <include>$(ICU_PATH)/include 
+        <library>icuuc_64/<link>shared/<runtime-link>shared 
+        <library>icudt_64/<link>shared/<runtime-link>shared 
+        <library>icuin_64/<link>shared/<runtime-link>shared
+        <dll-path>$(ICU_PATH)/bin64
+          <runtime-link>shared ;
+   
+      
+  }
 }
 
 obj has_icu_obj     : ../build/has_icu_test.cpp : $(ICU_OPTS)   ;