diff --git a/Code/BasicFilters/otbMeanShiftImageFilter.txx b/Code/BasicFilters/otbMeanShiftImageFilter.txx
index 5a58db8a62a00bbad020d4ced0c986fc4b65b208..2b12c42c87a047913e1a1f30e33d01e0fcc98e1b 100644
--- a/Code/BasicFilters/otbMeanShiftImageFilter.txx
+++ b/Code/BasicFilters/otbMeanShiftImageFilter.txx
@@ -395,8 +395,8 @@ MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
     regionIndeces = regionList->GetRegionIndeces(static_cast<int>(label));
     for (int i = 0; i<regionList->GetRegionCount(static_cast<int>(label)); ++i)
     {
-      boundIndex[0]= regionIndeces[i] % clusterBoudariesOutputPtr->GetRequestedRegion().GetSize()[0];
-      boundIndex[1]= regionIndeces[i] / clusterBoudariesOutputPtr->GetRequestedRegion().GetSize()[0];
+      boundIndex[0]= (regionIndeces[i] % clusterBoudariesOutputPtr->GetRequestedRegion().GetSize()[0])+clusterBoudariesOutputPtr->GetRequestedRegion().GetIndex()[0];
+      boundIndex[1]= (regionIndeces[i] / clusterBoudariesOutputPtr->GetRequestedRegion().GetSize()[0])+clusterBoudariesOutputPtr->GetRequestedRegion().GetIndex()[1];
       if (clusterBoudariesOutputPtr->GetBufferedRegion().IsInside(boundIndex))
       {
         clusterBoudariesOutputPtr->SetPixel(boundIndex,1);
diff --git a/Code/Gui/CMakeLists.txt b/Code/Gui/CMakeLists.txt
index 852d1cc3afb24c7c363f2caa79f52f4e712019e6..d4121a4fbde15fbd41a8bff9f3266933b30d244f 100644
--- a/Code/Gui/CMakeLists.txt
+++ b/Code/Gui/CMakeLists.txt
@@ -2,15 +2,6 @@
 
 FILE(GLOB OTBGui_SRCS "*.cxx" )
 
-
-# To suppress "ld: cycle in dylib re-exports with /usr/X11R6/lib/libGL.dylib" error on APPLE and SHARED configuration 
-IF(APPLE AND BUILD_SHARED_LIBS)
-      FOREACH(c "" "_DEBUG" "_RELEASE" "_MINSIZEREL" "_RELWITHDEBINFO")
-        SET(CMAKE_SHARED_LINKER_FLAGS${c} "${CMAKE_SHARED_LINKER_FLAGS${c}};-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
-      ENDFOREACH(c)
-ENDIF(APPLE AND BUILD_SHARED_LIBS)
-
-
 ADD_LIBRARY(OTBGui ${OTBGui_SRCS})
 TARGET_LINK_LIBRARIES (OTBGui OTBCommon ${OTB_VISU_GUI_LIBRARIES})
 IF(OTB_LIBRARY_PROPERTIES)
diff --git a/Code/Projections/otbLambert3CartoSudProjection.h b/Code/Projections/otbLambert3CartoSudProjection.h
new file mode 100644
index 0000000000000000000000000000000000000000..849d5db3363330fcfa5daac99f7569fad1b49316
--- /dev/null
+++ b/Code/Projections/otbLambert3CartoSudProjection.h
@@ -0,0 +1,69 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE,  See the above copyright notices for more information.
+
+=========================================================================*/
+#ifndef __otbLambert3CartoSudProjection_h
+#define __otbLambert3CartoSudProjection_h
+
+
+#include "projection/ossimMapProjection.h"
+#include "projection/ossimLambertConformalConicProjection.h"
+#include "otbMapProjection.h"
+
+namespace otb
+{
+/** \class Lambert3CartoSudProjection
+* \brief This class implements the Lambert3CartoSud map projection (RGF93 french geodesic system).
+* It converts coordinates in longitude,latitude (WGS84) to Lambert 3 map coordinates.
+*
+ */
+template <InverseOrForwardTransformationEnum transform>
+class ITK_EXPORT Lambert3CartoSudProjection : public LambertConformalConicMapProjection<transform>
+{
+public :
+  /** Standard class typedefs. */
+  typedef Lambert3CartoSudProjection                  Self;
+  typedef LambertConformalConicMapProjection<transform>   Superclass;
+  typedef itk::SmartPointer<Self>                          Pointer;
+  typedef itk::SmartPointer<const Self>                    ConstPointer;
+
+  typedef typename Superclass::ScalarType                 ScalarType;
+  typedef itk::Point<ScalarType,2 >                       InputPointType;
+  typedef itk::Point<ScalarType,2 >                        OutputPointType;
+
+  /** Method for creation through the object factory. */
+  itkNewMacro( Self );
+
+  /** Run-time type information (and related methods). */
+  itkTypeMacro( Lambert3CartoSudProjection, LambertConformalConicMapProjection);
+
+
+protected:
+  Lambert3CartoSudProjection();
+  virtual ~Lambert3CartoSudProjection();
+
+private :
+  Lambert3CartoSudProjection(const Self&); //purposely not implemented
+  void operator=(const Self&);                       //purposely not implemented
+};
+
+} // namespace otb
+
+#ifndef OTB_MANUAL_INSTANTIATION
+#include "otbLambert3CartoSudProjection.txx"
+#endif
+
+#endif
diff --git a/Code/Projections/otbLambert3CartoSudProjection.txx b/Code/Projections/otbLambert3CartoSudProjection.txx
new file mode 100644
index 0000000000000000000000000000000000000000..a1b237646e01732ceb593eaad7c1872ff27c93c9
--- /dev/null
+++ b/Code/Projections/otbLambert3CartoSudProjection.txx
@@ -0,0 +1,59 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE,  See the above copyright notices for more information.
+
+=========================================================================*/
+
+#ifndef __otbLambert3CartoSudProjection_txx
+#define __otbLambert3CartoSudProjection_txx
+
+#include "otbLambert3CartoSudProjection.h"
+
+namespace otb
+{
+
+template <InverseOrForwardTransformationEnum transform>
+Lambert3CartoSudProjection<transform>
+::Lambert3CartoSudProjection()
+{
+  itk::Point<double,2> origin;
+  origin[0]=3;
+  origin[1]=46.5;
+  std::string datum = "WE"; //WGS84 datum
+
+
+  double parall1=43.1992913888888888888888888889;
+  double parall2=44.9960938888888888888888888888;
+  double falseEasting=600000;
+  double falseNorthing=3200000;
+  std::string ellipsoid = "CE";
+
+  //TODO: 29-02-2008 Emmanuel: when ossim version > 1.7.2 only
+  // SetOrigin required (remove SetEllipsoid)
+  this->SetOrigin(origin, datum);
+  this->SetEllipsoid(ellipsoid);
+  this->SetParameters(parall1, parall2, falseEasting, falseNorthing);
+}
+
+template <InverseOrForwardTransformationEnum transform>
+Lambert3CartoSudProjection<transform>
+::~Lambert3CartoSudProjection()
+{
+}
+
+
+} // namespace otb
+
+#endif
diff --git a/Code/Projections/otbMapProjections.h b/Code/Projections/otbMapProjections.h
index 8875a37bdaa821709381de7bf9601753e6700ad9..2b7ab59bccd134a643085ddeba8a8f408d927860 100644
--- a/Code/Projections/otbMapProjections.h
+++ b/Code/Projections/otbMapProjections.h
@@ -50,6 +50,7 @@ See OTBCopyright.txt for details.
 #include "otbUtmMapProjection.h"
 #include "otbLambertConformalConicMapProjection.h"
 #include "otbLambert2EtenduProjection.h"
+#include "otbLambert3CartoSudProjection.h"
 #include "otbLambert93Projection.h"
 #include "otbEckert4MapProjection.h"
 #include "otbTransMercatorMapProjection.h"
@@ -84,6 +85,8 @@ typedef LambertConformalConicMapProjection<INVERSE>                LambertConfor
 typedef LambertConformalConicMapProjection<FORWARD>                LambertConformalConicForwardProjection;
 typedef Lambert2EtenduProjection<INVERSE>                          Lambert2EtenduInverseProjection;
 typedef Lambert2EtenduProjection<FORWARD>                          Lambert2EtenduForwardProjection;
+typedef Lambert3CartoSudProjection<INVERSE>                          Lambert3CartoSudInverseProjection;
+typedef Lambert3CartoSudProjection<FORWARD>                          Lambert3CartoSudForwardProjection;
 typedef Lambert93Projection<INVERSE>                               Lambert93InverseProjection;
 typedef Lambert93Projection<FORWARD>                               Lambert93ForwardProjection;
 typedef SVY21MapProjection<INVERSE>                                SVY21InverseProjection;
diff --git a/Code/Projections/otbOrthoRectificationFilter.h b/Code/Projections/otbOrthoRectificationFilter.h
index 16a84571ff3e91991412240a3953e3933ca121c1..9a48d6105f3c7bc22b6db8de3deff33a59244f9e 100644
--- a/Code/Projections/otbOrthoRectificationFilter.h
+++ b/Code/Projections/otbOrthoRectificationFilter.h
@@ -83,12 +83,12 @@ public :
   itkTypeMacro( OrthoRectificationFilter, StreamingResampleImageFilter );
 
   /** Accessors */
-  virtual void SetMapProjection (MapProjectionType* _arg)
+  virtual void SetMapProjection (MapProjectionType* arg)
   {
-    if (this->m_MapProjection != _arg)
+    if (this->m_MapProjection != arg)
     {
-      this->m_MapProjection = _arg;
-      m_CompositeTransform->SetFirstTransform(_arg);
+      this->m_MapProjection = arg;
+      m_CompositeTransform->SetFirstTransform(arg);
       m_IsComputed = false;
       this->Modified();
     }
diff --git a/Code/Radiometry/CMakeLists.txt b/Code/Radiometry/CMakeLists.txt
index db3ff67df4dac6b553f8c27fe8055af42cd921a2..b14a18b2ed6882f86f615cf5bf46cf7e5745e8a7 100644
--- a/Code/Radiometry/CMakeLists.txt
+++ b/Code/Radiometry/CMakeLists.txt
@@ -3,7 +3,7 @@
 FILE(GLOB OTBRadiometry_SRCS "*.cxx" )
 
 ADD_LIBRARY(OTBRadiometry ${OTBRadiometry_SRCS})
-TARGET_LINK_LIBRARIES (OTBRadiometry OTBCommon otb6S)
+TARGET_LINK_LIBRARIES (OTBRadiometry OTBCommon otb6S otbossim)
 IF(OTB_LIBRARY_PROPERTIES)
   SET_TARGET_PROPERTIES(OTBRadiometry PROPERTIES ${OTB_LIBRARY_PROPERTIES})
 ENDIF(OTB_LIBRARY_PROPERTIES)
diff --git a/Code/Visu/CMakeLists.txt b/Code/Visu/CMakeLists.txt
index d43a587b5da37275884581c32ef35052bb711183..b0fcfa82b72ea1bba40e24fff676e8c11db70a1f 100644
--- a/Code/Visu/CMakeLists.txt
+++ b/Code/Visu/CMakeLists.txt
@@ -2,13 +2,6 @@
 
 FILE(GLOB OTBVisu_SRCS "*.cxx" )
 
-# To suppress "ld: cycle in dylib re-exports with /usr/X11R6/lib/libGL.dylib" error on APPLE and SHARED configuration 
-IF(APPLE AND BUILD_SHARED_LIBS)
-      FOREACH(c "" "_DEBUG" "_RELEASE" "_MINSIZEREL" "_RELWITHDEBINFO")
-        SET(CMAKE_SHARED_LINKER_FLAGS${c} "${CMAKE_SHARED_LINKER_FLAGS${c}} -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
-      ENDFOREACH(c)
-ENDIF(APPLE AND BUILD_SHARED_LIBS)
-
 ADD_LIBRARY(OTBVisu ${OTBVisu_SRCS})
 TARGET_LINK_LIBRARIES (OTBVisu OTBGui OTBCommon ${OTB_VISU_GUI_LIBRARIES})
 IF(OTB_LIBRARY_PROPERTIES)
diff --git a/Code/Visualization/CMakeLists.txt b/Code/Visualization/CMakeLists.txt
index 9bfc18f098c1e735144c859aea1ff3de4054606e..4f38b18bab4b68d2052b4a0bdb03dd4e112f6d7f 100644
--- a/Code/Visualization/CMakeLists.txt
+++ b/Code/Visualization/CMakeLists.txt
@@ -2,17 +2,10 @@
 
 FILE(GLOB OTBVisualization_SRCS "*.cxx" )
 
-# To suppress "ld: cycle in dylib re-exports with /usr/X11R6/lib/libGL.dylib" error on APPLE and SHARED configuration 
-IF(APPLE AND BUILD_SHARED_LIBS)
-      FOREACH(c "" "_DEBUG" "_RELEASE" "_MINSIZEREL" "_RELWITHDEBINFO")
-        SET(CMAKE_SHARED_LINKER_FLAGS${c} "${CMAKE_SHARED_LINKER_FLAGS${c}} -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
-      ENDFOREACH(c)
-ENDIF(APPLE AND BUILD_SHARED_LIBS)
-
 FLTK_WRAP_UI(OTBVisualization otbImageWidgetPackedManager.fl otbImageWidgetSplittedManager.fl)
 
 ADD_LIBRARY(OTBVisualization ${OTBVisualization_SRCS} ${OTBVisualization_FLTK_UI_SRCS})
-TARGET_LINK_LIBRARIES (OTBVisualization OTBGui OTBCommon ${OTB_VISU_GUI_LIBRARIES})
+TARGET_LINK_LIBRARIES (OTBVisualization OTBGui OTBCommon OTBIO ${OTB_VISU_GUI_LIBRARIES})
 IF(OTB_LIBRARY_PROPERTIES)
   SET_TARGET_PROPERTIES(OTBVisualization PROPERTIES ${OTB_LIBRARY_PROPERTIES})
 ENDIF(OTB_LIBRARY_PROPERTIES)
diff --git a/Testing/Code/Common/otbConfigurationTest.cxx b/Testing/Code/Common/otbConfigurationTest.cxx
index 7931da967c9cc8587e0ae9f9f3d85844a88bc559..1009b21cefe7d75e271b4c0a7f91df5a4713f3e5 100644
--- a/Testing/Code/Common/otbConfigurationTest.cxx
+++ b/Testing/Code/Common/otbConfigurationTest.cxx
@@ -33,7 +33,7 @@ int otbConfigurationTest(int argc, char * argv[])
   
   std::cout << conf << std::endl;
   
-  if (lang != "fr_FR.UTF-8" || lang != "en_EN.UTF-8")
+  if( lang.compare("fr_FR.UTF-8") != 0  && lang.compare("en_EN.UTF-8") !=0 )
   {
     std::cout << "Locale language " << lang << std::endl;
     return EXIT_FAILURE;
diff --git a/Testing/Code/IO/CMakeLists.txt b/Testing/Code/IO/CMakeLists.txt
index 98a2565404cc2b400dd81fe160fcb0321b46b51a..7715ca8d0996b5bee3f9b9d9ac626d07d43f41de 100755
--- a/Testing/Code/IO/CMakeLists.txt
+++ b/Testing/Code/IO/CMakeLists.txt
@@ -1769,9 +1769,11 @@ ADD_TEST(otbOGRVectorDataIOTestCanRead ${IO_TESTS15}
         ${INPUTDATA}/LOCALITY_POLYGON.tab)
 
 # CanRead OGR PostGIS()
+IF(OTB_USE_PQXX)
 ADD_TEST(otbOGRVectorDataIOTestCanRead ${IO_TESTS15}
         otbOGRVectorDataIOTestCanRead
         PG:"dbname='orfeotoolbox_test' host='localhost' port='5432' user='orfeotoolbox_test_user' password='Bidfeud0'")
+ENDIF(OTB_USE_PQXX)
 
 # CanWrite OGR GML()
 ADD_TEST(otbOGRVectorDataIOCanWrite ${IO_TESTS15}
@@ -1784,10 +1786,12 @@ ADD_TEST(otbOGRVectorDataIOCanWrite ${IO_TESTS15}
         ${INPUTDATA}/LOCALITY_POLYGON.tab)
 
 # Canwrite OGR PostGIS()
+IF(OTB_USE_PQXX)
 ADD_TEST(otbOGRVectorDataIOCanWrite ${IO_TESTS15}
         otbOGRVectorDataIOCanWrite
         PG:"dbname='orfeotoolbox_test' host='localhost' port='5432' user='orfeotoolbox_test_user' password='Bidfeud0'")
-        
+ENDIF(OTB_USE_PQXX)
+      
 ADD_TEST(ioTuKMLVectorDataIO ${IO_TESTS15}
         otbKMLVectorDataIONew )
 
diff --git a/Testing/Utilities/CMakeLists.txt b/Testing/Utilities/CMakeLists.txt
index db6615dafa1485ab5710530cbe71f14d5690cc73..60af30f912a38437d2db62ea9e899db014d4c359 100644
--- a/Testing/Utilities/CMakeLists.txt
+++ b/Testing/Utilities/CMakeLists.txt
@@ -30,16 +30,18 @@ SET(UTILITIES_TESTS ${CXX_TEST_PATH}/otbUtilitiesTests)
 IF(OTB_DATA_USE_LARGEINPUT)
 
 ADD_TEST(utTvOssimKeywordlistToulouseQuickBirdTest ${UTILITIES_TESTS}
---compare-list ${EPSILON_6}  ${BASELINE_FILES}/utOssimKeywordlistToulouseQuickBird.txt
-                        ${TEMP}/utOssimKeywordlistToulouseQuickBird.txt
+--ignore-order --compare-ascii ${EPSILON_6}  
+	       ${BASELINE_FILES}/utOssimKeywordlistToulouseQuickBird.txt
+	       ${TEMP}/utOssimKeywordlistToulouseQuickBird.txt
         ossimKeywordlistTest
         ${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
         ${TEMP}/utOssimKeywordlistToulouseQuickBird.txt
         )
 
 ADD_TEST(utTvOssimKeywordlistBlossevilleIkonosTest ${UTILITIES_TESTS}
---compare-list ${NOTOL}  ${BASELINE_FILES}/utOssimKeywordlistBlossevilleIkonos.txt
-                        ${TEMP}/utOssimKeywordlistBlossevilleIkonos.txt
+--ignore-order --compare-ascii ${NOTOL} 
+	        ${BASELINE_FILES}/utOssimKeywordlistBlossevilleIkonos.txt
+		${TEMP}/utOssimKeywordlistBlossevilleIkonos.txt
         ossimKeywordlistTest
         ${IMAGEDATA}/IKONOS/BLOSSEVILLE/po_2619900_grn_0000000.tif
         ${TEMP}/utOssimKeywordlistBlossevilleIkonos.txt
diff --git a/Utilities/BGL/boost/assert.hpp b/Utilities/BGL/boost/assert.hpp
index 5619f29898eaf8b6425d4b664d509a658d57d396..ebc67ae9d8be86be0e99f3eabb81c47a86c20477 100644
--- a/Utilities/BGL/boost/assert.hpp
+++ b/Utilities/BGL/boost/assert.hpp
@@ -9,7 +9,7 @@
 //
 //  Note: There are no include guards. This is intentional.
 //
-//  See http://www.boost.org/libs/utility/assert.html for documentation.
+//  See http://www.boost.org/libs/butility/assert.html for documentation.
 //
 
 #undef BOOST_ASSERT
diff --git a/Utilities/BGL/boost/utility/addressof.hpp b/Utilities/BGL/boost/butility/addressof.hpp
similarity index 100%
rename from Utilities/BGL/boost/utility/addressof.hpp
rename to Utilities/BGL/boost/butility/addressof.hpp
diff --git a/Utilities/BGL/boost/utility/base_from_member.hpp b/Utilities/BGL/boost/butility/base_from_member.hpp
similarity index 97%
rename from Utilities/BGL/boost/utility/base_from_member.hpp
rename to Utilities/BGL/boost/butility/base_from_member.hpp
index 04aabb59e26ee92a21bfdfe53adb2a28198a4520..893133e6b51ab7292ff2c9322280ff8a5744cea4 100644
--- a/Utilities/BGL/boost/utility/base_from_member.hpp
+++ b/Utilities/BGL/boost/butility/base_from_member.hpp
@@ -5,7 +5,7 @@
 //  accompanying file LICENSE_1_0.txt or a copy at
 //  <http://www.boost.org/LICENSE_1_0.txt>.)
 
-//  See <http://www.boost.org/libs/utility/> for the library's home page.
+//  See <http://www.boost.org/libs/butility/> for the library's home page.
 
 #ifndef BOOST_UTILITY_BASE_FROM_MEMBER_HPP
 #define BOOST_UTILITY_BASE_FROM_MEMBER_HPP
diff --git a/Utilities/BGL/boost/utility/compare_pointees.hpp b/Utilities/BGL/boost/butility/compare_pointees.hpp
similarity index 100%
rename from Utilities/BGL/boost/utility/compare_pointees.hpp
rename to Utilities/BGL/boost/butility/compare_pointees.hpp
diff --git a/Utilities/BGL/boost/utility/detail/in_place_factory_prefix.hpp b/Utilities/BGL/boost/butility/detail/in_place_factory_prefix.hpp
similarity index 100%
rename from Utilities/BGL/boost/utility/detail/in_place_factory_prefix.hpp
rename to Utilities/BGL/boost/butility/detail/in_place_factory_prefix.hpp
diff --git a/Utilities/BGL/boost/utility/detail/in_place_factory_suffix.hpp b/Utilities/BGL/boost/butility/detail/in_place_factory_suffix.hpp
similarity index 100%
rename from Utilities/BGL/boost/utility/detail/in_place_factory_suffix.hpp
rename to Utilities/BGL/boost/butility/detail/in_place_factory_suffix.hpp
diff --git a/Utilities/BGL/boost/utility/detail/result_of_iterate.hpp b/Utilities/BGL/boost/butility/detail/result_of_iterate.hpp
similarity index 97%
rename from Utilities/BGL/boost/utility/detail/result_of_iterate.hpp
rename to Utilities/BGL/boost/butility/detail/result_of_iterate.hpp
index 5aa3a5ccda4306814881ed3e7901e647558a03d2..b2031e49a7b6d1b8ab5e46a93f6c9508d7c5d0e7 100644
--- a/Utilities/BGL/boost/utility/detail/result_of_iterate.hpp
+++ b/Utilities/BGL/boost/butility/detail/result_of_iterate.hpp
@@ -5,7 +5,7 @@
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-// For more information, see http://www.boost.org/libs/utility
+// For more information, see http://www.boost.org/libs/butility
 #if !defined(BOOST_PP_IS_ITERATING)
 # error Boost result_of - do not include this file!
 #endif
diff --git a/Utilities/BGL/boost/utility/enable_if.hpp b/Utilities/BGL/boost/butility/enable_if.hpp
similarity index 100%
rename from Utilities/BGL/boost/utility/enable_if.hpp
rename to Utilities/BGL/boost/butility/enable_if.hpp
diff --git a/Utilities/BGL/boost/utility/in_place_factory.hpp b/Utilities/BGL/boost/butility/in_place_factory.hpp
similarity index 93%
rename from Utilities/BGL/boost/utility/in_place_factory.hpp
rename to Utilities/BGL/boost/butility/in_place_factory.hpp
index 612c9a3af614837c6a9384bc7c8083a7e7d886bc..99d181e9f259ec6c63322846f6609fa4f006c22b 100644
--- a/Utilities/BGL/boost/utility/in_place_factory.hpp
+++ b/Utilities/BGL/boost/butility/in_place_factory.hpp
@@ -12,7 +12,7 @@
 #ifndef BOOST_UTILITY_INPLACE_FACTORY_25AGO2003_HPP
 #define BOOST_UTILITY_INPLACE_FACTORY_25AGO2003_HPP
 
-#include <boost/utility/detail/in_place_factory_prefix.hpp>
+#include <boost/butility/detail/in_place_factory_prefix.hpp>
 
 #include <boost/type.hpp>
 
@@ -52,7 +52,7 @@ BOOST_PP_REPEAT( BOOST_MAX_INPLACE_FACTORY_ARITY, BOOST_DEFINE_INPLACE_FACTORY_C
 
 } // namespace boost
 
-#include <boost/utility/detail/in_place_factory_suffix.hpp>
+#include <boost/butility/detail/in_place_factory_suffix.hpp>
 
 #endif
 
diff --git a/Utilities/BGL/boost/utility/result_of.hpp b/Utilities/BGL/boost/butility/result_of.hpp
similarity index 93%
rename from Utilities/BGL/boost/utility/result_of.hpp
rename to Utilities/BGL/boost/butility/result_of.hpp
index 668cb696cb3705996670fe1590d923d68030a279..4199a2743629a8c60349bbbd65937317aac67c7f 100644
--- a/Utilities/BGL/boost/utility/result_of.hpp
+++ b/Utilities/BGL/boost/butility/result_of.hpp
@@ -5,7 +5,7 @@
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-// For more information, see http://www.boost.org/libs/utility
+// For more information, see http://www.boost.org/libs/butility
 #ifndef BOOST_RESULT_OF_HPP
 #define BOOST_RESULT_OF_HPP
 
@@ -54,7 +54,7 @@ struct result_of : get_result_of<F, FArgs, (has_result_type<F>::value)> {};
 
 } // end namespace detail
 
-#define BOOST_PP_ITERATION_PARAMS_1 (3,(0,BOOST_RESULT_OF_NUM_ARGS,<boost/utility/detail/result_of_iterate.hpp>))
+#define BOOST_PP_ITERATION_PARAMS_1 (3,(0,BOOST_RESULT_OF_NUM_ARGS,<boost/butility/detail/result_of_iterate.hpp>))
 #include BOOST_PP_ITERATE()
 
 #else
diff --git a/Utilities/BGL/boost/utility/typed_in_place_factory.hpp b/Utilities/BGL/boost/butility/typed_in_place_factory.hpp
similarity index 93%
rename from Utilities/BGL/boost/utility/typed_in_place_factory.hpp
rename to Utilities/BGL/boost/butility/typed_in_place_factory.hpp
index e19fb75df97313acfcc8dfafa12d2ad557a134db..f8df6f60e2a40143ebbffdda1368fb988281ee92 100644
--- a/Utilities/BGL/boost/utility/typed_in_place_factory.hpp
+++ b/Utilities/BGL/boost/butility/typed_in_place_factory.hpp
@@ -12,7 +12,7 @@
 #ifndef BOOST_UTILITY_TYPED_INPLACE_FACTORY_25AGO2003_HPP
 #define BOOST_UTILITY_TYPED_INPLACE_FACTORY_25AGO2003_HPP
 
-#include <boost/utility/detail/in_place_factory_prefix.hpp>
+#include <boost/butility/detail/in_place_factory_prefix.hpp>
 
 namespace boost {
 
@@ -51,7 +51,7 @@ BOOST_PP_REPEAT( BOOST_MAX_INPLACE_FACTORY_ARITY, BOOST_DEFINE_TYPED_INPLACE_FAC
 
 } // namespace boost
 
-#include <boost/utility/detail/in_place_factory_suffix.hpp>
+#include <boost/butility/detail/in_place_factory_suffix.hpp>
 
 #endif
 
diff --git a/Utilities/BGL/boost/utility/value_init.hpp b/Utilities/BGL/boost/butility/value_init.hpp
similarity index 100%
rename from Utilities/BGL/boost/utility/value_init.hpp
rename to Utilities/BGL/boost/butility/value_init.hpp
diff --git a/Utilities/BGL/boost/call_traits.hpp b/Utilities/BGL/boost/call_traits.hpp
index 5253a6de587f7dc3e50d5be892cf592dc06d19aa..72c6474f5704b339b802f30b7ec4b86fad9e220e 100644
--- a/Utilities/BGL/boost/call_traits.hpp
+++ b/Utilities/BGL/boost/call_traits.hpp
@@ -3,7 +3,7 @@
 //  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt).
 //
-//  See http://www.boost.org/libs/utility for most recent version including documentation.
+//  See http://www.boost.org/libs/butility for most recent version including documentation.
 
 //  See boost/detail/call_traits.hpp and boost/detail/ob_call_traits.hpp
 //  for full copyright notices.
diff --git a/Utilities/BGL/boost/checked_delete.hpp b/Utilities/BGL/boost/checked_delete.hpp
index 9bb84e8e1ba9f1aa8c349a34618877c7c2e3ccdf..5fd9ae8bbe65a5632c50e31653701a5b4a134503 100644
--- a/Utilities/BGL/boost/checked_delete.hpp
+++ b/Utilities/BGL/boost/checked_delete.hpp
@@ -18,7 +18,7 @@
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
-//  See http://www.boost.org/libs/utility/checked_delete.html for documentation.
+//  See http://www.boost.org/libs/butility/checked_delete.html for documentation.
 //
 
 namespace boost
diff --git a/Utilities/BGL/boost/compressed_pair.hpp b/Utilities/BGL/boost/compressed_pair.hpp
index e6cd6a074a8952caeaa469a424cbe69018c757ce..24e157b1d4b887fdc97e1c614a25f9d71f17f96d 100644
--- a/Utilities/BGL/boost/compressed_pair.hpp
+++ b/Utilities/BGL/boost/compressed_pair.hpp
@@ -3,7 +3,7 @@
 //  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt).
 //
-//  See http://www.boost.org/libs/utility for most recent version including documentation.
+//  See http://www.boost.org/libs/butility for most recent version including documentation.
 
 //  See boost/detail/compressed_pair.hpp and boost/detail/ob_compressed_pair.hpp
 //  for full copyright notices.
diff --git a/Utilities/BGL/boost/detail/call_traits.hpp b/Utilities/BGL/boost/detail/call_traits.hpp
index 0d9e99febf3b066b79f1dbfe233c9edbb05ca1c2..f330eb8d03b22e82aa6d1a2d348175dfcb4bcd04 100644
--- a/Utilities/BGL/boost/detail/call_traits.hpp
+++ b/Utilities/BGL/boost/detail/call_traits.hpp
@@ -3,10 +3,10 @@
 //  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt).
 //
-//  See http://www.boost.org/libs/utility for most recent version including documentation.
+//  See http://www.boost.org/libs/butility for most recent version including documentation.
 
 // call_traits: defines typedefs for function usage
-// (see libs/utility/call_traits.htm)
+// (see libs/butility/call_traits.htm)
 
 /* Release notes:
    23rd July 2000:
diff --git a/Utilities/BGL/boost/detail/compressed_pair.hpp b/Utilities/BGL/boost/detail/compressed_pair.hpp
index c45d20c599dc2c5207a2aa333974534bed6fa548..ddec0886187bcc009a6899283db4d5fe70f4f166 100644
--- a/Utilities/BGL/boost/detail/compressed_pair.hpp
+++ b/Utilities/BGL/boost/detail/compressed_pair.hpp
@@ -3,10 +3,10 @@
 //  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt).
 //
-//  See http://www.boost.org/libs/utility for most recent version including documentation.
+//  See http://www.boost.org/libs/butility for most recent version including documentation.
 
 // compressed_pair: pair that "compresses" empty members
-// (see libs/utility/compressed_pair.htm)
+// (see libs/butility/compressed_pair.htm)
 //
 // JM changes 25 Jan 2004:
 // For the case where T1 == T2 and both are empty, then first() and second()
diff --git a/Utilities/BGL/boost/detail/ob_call_traits.hpp b/Utilities/BGL/boost/detail/ob_call_traits.hpp
index eb4df7a30f1969e0fb33d09578c83f4912f09e9a..42f12fdc6d5b3cb3742ee25e00748999647d8f98 100644
--- a/Utilities/BGL/boost/detail/ob_call_traits.hpp
+++ b/Utilities/BGL/boost/detail/ob_call_traits.hpp
@@ -3,10 +3,10 @@
 //  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt).
 //
-//  See http://www.boost.org/libs/utility for most recent version including documentation.
+//  See http://www.boost.org/libs/butility for most recent version including documentation.
 //
 //  Crippled version for crippled compilers:
-//  see libs/utility/call_traits.htm
+//  see libs/butility/call_traits.htm
 //
 
 /* Release notes:
diff --git a/Utilities/BGL/boost/detail/ob_compressed_pair.hpp b/Utilities/BGL/boost/detail/ob_compressed_pair.hpp
index 727acab6da498aa212c3c7d20057f9f661e7063d..280fe43dd5a2d711d67870febdc190f22e9c4d56 100644
--- a/Utilities/BGL/boost/detail/ob_compressed_pair.hpp
+++ b/Utilities/BGL/boost/detail/ob_compressed_pair.hpp
@@ -3,8 +3,8 @@
 //  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt).
 //
-//  See http://www.boost.org/libs/utility for most recent version including documentation.
-//  see libs/utility/compressed_pair.hpp
+//  See http://www.boost.org/libs/butility for most recent version including documentation.
+//  see libs/butility/compressed_pair.hpp
 //
 /* Release notes:
    20 Jan 2001:
diff --git a/Utilities/BGL/boost/function/function_base.hpp b/Utilities/BGL/boost/function/function_base.hpp
index 30f691611d6d88263d728701ad9a654420701e93..ab039fe48d322a859166f47a0a93bcf56f0543d5 100644
--- a/Utilities/BGL/boost/function/function_base.hpp
+++ b/Utilities/BGL/boost/function/function_base.hpp
@@ -24,7 +24,7 @@
 #include <boost/pending/ct_if.hpp>
 #include <boost/detail/workaround.hpp>
 #ifndef BOOST_NO_SFINAE
-#  include "boost/utility/enable_if.hpp"
+#  include "boost/butility/enable_if.hpp"
 #else
 #  include "boost/mpl/bool.hpp"
 #endif
diff --git a/Utilities/BGL/boost/graph/detail/read_graphviz_spirit.hpp b/Utilities/BGL/boost/graph/detail/read_graphviz_spirit.hpp
index 07b298d2c156a5357c30ceddfd9bd08e342f128a..42f8dae6e6edd224e03a7ea8ab26f8e15d73475d 100644
--- a/Utilities/BGL/boost/graph/detail/read_graphviz_spirit.hpp
+++ b/Utilities/BGL/boost/graph/detail/read_graphviz_spirit.hpp
@@ -30,10 +30,10 @@
 
 #include <boost/spirit/iterator/multi_pass.hpp>
 #include <boost/spirit/core.hpp>
-#include <boost/spirit/utility/confix.hpp>
-#include <boost/spirit/utility/distinct.hpp>
-#include <boost/spirit/utility/lists.hpp>
-#include <boost/spirit/utility/escape_char.hpp>
+#include <boost/spirit/butility/confix.hpp>
+#include <boost/spirit/butility/distinct.hpp>
+#include <boost/spirit/butility/lists.hpp>
+#include <boost/spirit/butility/escape_char.hpp>
 #include <boost/spirit/attribute.hpp>
 #include <boost/spirit/dynamic.hpp>
 #include <boost/spirit/actor.hpp>
diff --git a/Utilities/BGL/boost/graph/doc/AStarHeuristic.html b/Utilities/BGL/boost/graph/doc/AStarHeuristic.html
index 004bb64aaae1ea5fef2967651807be50a9bf0b02..626d23ab8d4c227fb66dd0c77f46240d3760e33a 100644
--- a/Utilities/BGL/boost/graph/doc/AStarHeuristic.html
+++ b/Utilities/BGL/boost/graph/doc/AStarHeuristic.html
@@ -39,7 +39,7 @@ href="./astar_search.html">astar_search()</a>.
 <a href="http://www.sgi.com/tech/stl/UnaryFunction.html">Unary
 Function</a> (must take a single argument -- a graph vertex -- and
 return a cost value) and <a
-href="../../utility/CopyConstructible.html">Copy Constructible</a>
+href="../../butility/CopyConstructible.html">Copy Constructible</a>
 (copying a heuristic should be a lightweight operation).
 
 
diff --git a/Utilities/BGL/boost/graph/doc/AStarVisitor.html b/Utilities/BGL/boost/graph/doc/AStarVisitor.html
index 60d3acab8dea31c71903ad6e19e7fb0bff1f6f11..5a65598a5ed45e63c9f40a69965710dea770641d 100644
--- a/Utilities/BGL/boost/graph/doc/AStarVisitor.html
+++ b/Utilities/BGL/boost/graph/doc/AStarVisitor.html
@@ -29,7 +29,7 @@ taken during the graph search.
 
 <h3>Refinement of</h3>
 
-<a href="../../utility/CopyConstructible.html">Copy Constructible</a>
+<a href="../../butility/CopyConstructible.html">Copy Constructible</a>
 (copying a visitor should be a lightweight operation).
 
 
diff --git a/Utilities/BGL/boost/graph/doc/AdjacencyGraph.html b/Utilities/BGL/boost/graph/doc/AdjacencyGraph.html
index c902cd094296d966d71611ff9c2a4042b88f0100..38bde74f81592db49770d4ac62e9ad75f45bf108 100644
--- a/Utilities/BGL/boost/graph/doc/AdjacencyGraph.html
+++ b/Utilities/BGL/boost/graph/doc/AdjacencyGraph.html
@@ -73,7 +73,7 @@ An adjacency iterator for a vertex <i>v</i> provides access to the
 vertices adjacent to <i>v</i>.  As such, the value type of an
 adjacency iterator is the vertex descriptor type of its graph. An
 adjacency iterator must meet the requirements of <a
-href="../../utility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
+href="../../butility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
 </TD>
 </TR>
 
diff --git a/Utilities/BGL/boost/graph/doc/BFSVisitor.html b/Utilities/BGL/boost/graph/doc/BFSVisitor.html
index 8b17cc8f69c3c039b69a45d31832e633e346fa46..6ab79592c3aeebca4cbd52e9850aa8ca1834da30 100644
--- a/Utilities/BGL/boost/graph/doc/BFSVisitor.html
+++ b/Utilities/BGL/boost/graph/doc/BFSVisitor.html
@@ -29,7 +29,7 @@ augmenting the actions taken during the graph search.
 
 <h3>Refinement of</h3>
 
-<a href="../../utility/CopyConstructible.html">Copy Constructible</a>
+<a href="../../butility/CopyConstructible.html">Copy Constructible</a>
 (copying a visitor should be a lightweight operation).
 
 
diff --git a/Utilities/BGL/boost/graph/doc/BellmanFordVisitor.html b/Utilities/BGL/boost/graph/doc/BellmanFordVisitor.html
index addf198bebb3450db8d685a61f90577ce1bed5f2..1bc435bc8da15ec04127f1a4abf99f29984b4203 100644
--- a/Utilities/BGL/boost/graph/doc/BellmanFordVisitor.html
+++ b/Utilities/BGL/boost/graph/doc/BellmanFordVisitor.html
@@ -29,7 +29,7 @@ thereby augmenting the actions taken during the graph search.
 
 <h3>Refinement of</h3>
 
-<a href="../../utility/CopyConstructible.html">Copy Constructible</a>
+<a href="../../butility/CopyConstructible.html">Copy Constructible</a>
 (copying a visitor should be a lightweight operation).
 
 <h3>Notation</h3>
diff --git a/Utilities/BGL/boost/graph/doc/BidirectionalGraph.html b/Utilities/BGL/boost/graph/doc/BidirectionalGraph.html
index d3b5fde202904e9d5a221075129e9c8275c7f2d6..56fdbd994f488ab920b44a169cf9e20a9c095759 100644
--- a/Utilities/BGL/boost/graph/doc/BidirectionalGraph.html
+++ b/Utilities/BGL/boost/graph/doc/BidirectionalGraph.html
@@ -76,7 +76,7 @@ edges incident to the vertex.
 An in-edge iterator for a vertex <i>v</i> provides access to the
 in-edges of <i>v</i>.  As such, the value type of an in-edge iterator
 is the edge descriptor type of its graph. An in-edge iterator must
-meet the requirements of <a href="../../utility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
+meet the requirements of <a href="../../butility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
 </TD>
 </TR>
 
diff --git a/Utilities/BGL/boost/graph/doc/DFSVisitor.html b/Utilities/BGL/boost/graph/doc/DFSVisitor.html
index 4058a6ab73367dd13c80de88fa96dc94a8be39c6..f2bbe2c4fa3075ad1f2f7b195127bcbd0e34dbf7 100644
--- a/Utilities/BGL/boost/graph/doc/DFSVisitor.html
+++ b/Utilities/BGL/boost/graph/doc/DFSVisitor.html
@@ -29,7 +29,7 @@ augmenting the actions taken during the graph search.
 
 <h3>Refinement of</h3>
 
-<a href="../../utility/CopyConstructible.html">Copy Constructible</a>
+<a href="../../butility/CopyConstructible.html">Copy Constructible</a>
 (copying a visitor should be a lightweight operation).
 
 <h3>Notation</h3>
diff --git a/Utilities/BGL/boost/graph/doc/DijkstraVisitor.html b/Utilities/BGL/boost/graph/doc/DijkstraVisitor.html
index 5f5586cc0fb627a6298def82df850007ca6c0fe1..191ef522ec38897f7d1c27d9e2d66ae38f5a72a5 100644
--- a/Utilities/BGL/boost/graph/doc/DijkstraVisitor.html
+++ b/Utilities/BGL/boost/graph/doc/DijkstraVisitor.html
@@ -30,7 +30,7 @@ the search.
 
 <h3>Refinement of</h3>
 
-<a href="../../utility/CopyConstructible.html">Copy Constructible</a>
+<a href="../../butility/CopyConstructible.html">Copy Constructible</a>
 (copying a visitor should be a lightweight operation).
 
 
diff --git a/Utilities/BGL/boost/graph/doc/EdgeListGraph.html b/Utilities/BGL/boost/graph/doc/EdgeListGraph.html
index 68445af38d9029b08fe39df82b5ae2cbc6a54a72..fbc44ecb66541701aab528e4db2cdd08b718ccc1 100644
--- a/Utilities/BGL/boost/graph/doc/EdgeListGraph.html
+++ b/Utilities/BGL/boost/graph/doc/EdgeListGraph.html
@@ -69,7 +69,7 @@ edges in the graph.
 An edge iterator (obtained via <TT>edges(g)</TT>) provides access to
 all of the edges in a graph. An edge iterator type must meet the
 requirements of <a
-href="../../utility/MultiPassInputIterator.html">MultiPassInputIterator</a>.  The
+href="../../butility/MultiPassInputIterator.html">MultiPassInputIterator</a>.  The
 value type of the edge iterator must be the same as the edge
 descriptor of the graph.
 
diff --git a/Utilities/BGL/boost/graph/doc/EventVisitor.html b/Utilities/BGL/boost/graph/doc/EventVisitor.html
index 4324e7b4195ced42fb09ea94a8eddfb3aa00c1ab..2899c2e2567b8bcee6bdf882304e8599430f8284 100644
--- a/Utilities/BGL/boost/graph/doc/EventVisitor.html
+++ b/Utilities/BGL/boost/graph/doc/EventVisitor.html
@@ -60,7 +60,7 @@ namespace boost {
 
 <h3>Refinement of</h3>
 
-<a href="../../utility/CopyConstructible.html">Copy Constructible</a>
+<a href="../../butility/CopyConstructible.html">Copy Constructible</a>
 (copying a visitor should be a lightweight operation).
 
 <h3>Notation</h3>
diff --git a/Utilities/BGL/boost/graph/doc/IncidenceGraph.html b/Utilities/BGL/boost/graph/doc/IncidenceGraph.html
index 374207a4b418ba02e204df271ee68668d08c63d8..043bf1d30a8cfa1d8cbaa8930a5aad4d1e047f9e 100644
--- a/Utilities/BGL/boost/graph/doc/IncidenceGraph.html
+++ b/Utilities/BGL/boost/graph/doc/IncidenceGraph.html
@@ -74,7 +74,7 @@ An out-edge iterator for a vertex <i>v</i> provides access to the
 out-edges of the vertex.  As such, the value type of an out-edge
 iterator is the edge descriptor type of its graph. An out-edge
 iterator must meet the requirements of <a
-href="../../utility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
+href="../../butility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
 </TD>
 </TR>
 
diff --git a/Utilities/BGL/boost/graph/doc/Monoid.html b/Utilities/BGL/boost/graph/doc/Monoid.html
index 4a3e9453703b90452f366dfbe78b8ba79b8ae69c..be92272ea806ad96824c006721b2fcff83945dd1 100644
--- a/Utilities/BGL/boost/graph/doc/Monoid.html
+++ b/Utilities/BGL/boost/graph/doc/Monoid.html
@@ -34,8 +34,8 @@ and an object that represents the identity element.
 <H3>Refinement of</H3>
 
 The element type must be a model of <a
-href="../../utility/Assignable.html">Assignable</a> and <a
-href="../../utility/CopyConstructible.html">CopyConstructible</a>.
+href="../../butility/Assignable.html">Assignable</a> and <a
+href="../../butility/CopyConstructible.html">CopyConstructible</a>.
 The function object type must be a model of <a
 href="http://www.sgi.com/tech/stl/BinaryFunction.html">BinaryFunction</a>.
 
diff --git a/Utilities/BGL/boost/graph/doc/VertexListGraph.html b/Utilities/BGL/boost/graph/doc/VertexListGraph.html
index a2eca0b006ca51a0dcc3120ab687d3b91acdd46f..c1f7ac60e4c62efaf7395e649dda3fcf1018251d 100644
--- a/Utilities/BGL/boost/graph/doc/VertexListGraph.html
+++ b/Utilities/BGL/boost/graph/doc/VertexListGraph.html
@@ -47,7 +47,7 @@ efficient traversal of all the vertices in the graph.
 A vertex iterator (obtained via <TT>vertices(g)</TT>) provides access
 to all of the vertices in a graph.  A vertex iterator type must meet
 the requirements of <a
-href="../../utility/MultiPassInputIterator.html">MultiPassInputIterator</a>. The
+href="../../butility/MultiPassInputIterator.html">MultiPassInputIterator</a>. The
 value type of the vertex iterator must be the vertex descriptor of the
 graph.
 </TD>
diff --git a/Utilities/BGL/boost/graph/doc/adjacency_iterator.html b/Utilities/BGL/boost/graph/doc/adjacency_iterator.html
index d1adc43817ed1dba988a8316033e34afebca77b4..7b128a71df3a7d146fd584a87c4234d727673a32 100644
--- a/Utilities/BGL/boost/graph/doc/adjacency_iterator.html
+++ b/Utilities/BGL/boost/graph/doc/adjacency_iterator.html
@@ -100,7 +100,7 @@ definition of the graph class, and in that context we can not use
 
 The adjacency iterator adaptor (the type
 <tt>adjacency_iterator_generator<...>::type</tt>) is a model of <a
-href="../../utility/MultiPassInputIterator.html">Multi-Pass Input Iterator</a>
+href="../../butility/MultiPassInputIterator.html">Multi-Pass Input Iterator</a>
 </a>.
 
 
diff --git a/Utilities/BGL/boost/graph/doc/adjacency_list.html b/Utilities/BGL/boost/graph/doc/adjacency_list.html
index 3deed9793eacc71bfc3d39191e0792728bc1cacb..5f04b37884c90a3f7dc78d2fcba1d2c9198b4421 100644
--- a/Utilities/BGL/boost/graph/doc/adjacency_list.html
+++ b/Utilities/BGL/boost/graph/doc/adjacency_list.html
@@ -152,8 +152,8 @@ shows how to represent a family tree with a graph.
 <P>
 <a href="./VertexAndEdgeListGraph.html">VertexAndEdgeListGraph</a>, 
 <a href="./MutablePropertyGraph.html">MutablePropertyGraph</a>,
-<a href="../../utility/CopyConstructible.html">CopyConstructible</a>,
-and <a href="../../utility/Assignable.html">Assignable</a>.
+<a href="../../butility/CopyConstructible.html">CopyConstructible</a>,
+and <a href="../../butility/Assignable.html">Assignable</a>.
 
 <P>
 
diff --git a/Utilities/BGL/boost/graph/doc/adjacency_matrix.html b/Utilities/BGL/boost/graph/doc/adjacency_matrix.html
index 5e58f0fea7c68db71f5294a17160133fad025868..da21e5ac38309309009d2b1154fb683768a73101 100644
--- a/Utilities/BGL/boost/graph/doc/adjacency_matrix.html
+++ b/Utilities/BGL/boost/graph/doc/adjacency_matrix.html
@@ -212,8 +212,8 @@ The output is:
 <a href="./VertexAndEdgeListGraph.html">VertexAndEdgeListGraph</a>, <a
 href="./AdjacencyMatrix.html">AdjacencyMatrix</a>, <a
 href="./MutablePropertyGraph.html">MutablePropertyGraph</a>,
-<a href="../../utility/CopyConstructible.html">CopyConstructible</a>,
-and <a href="../../utility/Assignable.html">Assignable</a>.
+<a href="../../butility/CopyConstructible.html">CopyConstructible</a>,
+and <a href="../../butility/Assignable.html">Assignable</a>.
 
 
 <h3>Associates Types</h3>
@@ -245,14 +245,14 @@ The type for the edge descriptors associated with the
 <tt>graph_traits&lt;adjacency_matrix&gt;::edge_iterator</tt>
 <br><br>
   The type for the iterators returned by <tt>edges()</tt>. This
-  iterator models <a href="../../utility/MultiPassInputIterator.html">MultiPassInputIterator</a>.<br>
+  iterator models <a href="../../butility/MultiPassInputIterator.html">MultiPassInputIterator</a>.<br>
  (Required by <a href="EdgeListGraph.html">EdgeListGraph</a>.)
 
 <hr>
 <tt>graph_traits&lt;adjacency_matrix&gt;::out_edge_iterator</tt>
 <br><br>
   The type for the iterators returned by <tt>out_edges()</tt>.  This
-  iterator models <a href="../../utility/MultiPassInputIterator.html">MultiPassInputIterator</a>. <br>
+  iterator models <a href="../../butility/MultiPassInputIterator.html">MultiPassInputIterator</a>. <br>
   (Required by <a href="IncidenceGraph.html">IncidenceGraph</a>.)
 
 <hr>
diff --git a/Utilities/BGL/boost/graph/doc/filtered_graph.html b/Utilities/BGL/boost/graph/doc/filtered_graph.html
index b1d1a1bedcc3d61038df643f631b6b0cdd80501a..aacda4909f028952f55a016923d704f0b58a3d15 100644
--- a/Utilities/BGL/boost/graph/doc/filtered_graph.html
+++ b/Utilities/BGL/boost/graph/doc/filtered_graph.html
@@ -199,7 +199,7 @@ The type for the edge descriptors associated with the
 <tt>graph_traits&lt;filtered_graph&gt;::vertex_iterator</tt>
 <br><br>
 The type for the iterators returned by <TT>vertices()</TT>.
-The iterator is a model of <a href="../../utility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
+The iterator is a model of <a href="../../butility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
 
 
 <hr>
@@ -207,7 +207,7 @@ The iterator is a model of <a href="../../utility/MultiPassInputIterator.html">M
 <tt>graph_traits&lt;filtered_graph&gt;::edge_iterator</tt>
 <br><br>
 The type for the iterators returned by <TT>edges()</TT>.
-The iterator is a model of <a href="../../utility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
+The iterator is a model of <a href="../../butility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
 
 <hr>
 
@@ -215,7 +215,7 @@ The iterator is a model of <a href="../../utility/MultiPassInputIterator.html">M
 <tt>graph_traits&lt;filtered_graph&gt;::out_edge_iterator</tt>
 <br><br>
 The type for the iterators returned by <TT>out_edges()</TT>.
-The iterator is a model of <a href="../../utility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
+The iterator is a model of <a href="../../butility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
 
 
 <hr>
diff --git a/Utilities/BGL/boost/graph/doc/inv_adjacency_iterator.html b/Utilities/BGL/boost/graph/doc/inv_adjacency_iterator.html
index be851a167625f85384cb37018b6fdae904c0376a..5d7a33f733969e5573a1f6142f3fb08f14d06f3b 100644
--- a/Utilities/BGL/boost/graph/doc/inv_adjacency_iterator.html
+++ b/Utilities/BGL/boost/graph/doc/inv_adjacency_iterator.html
@@ -102,7 +102,7 @@ definition of the graph class, and in that context we can not use
 
 The inverse adjacency iterator adaptor (the type
 <tt>inv_adjacency_iterator_generator<...>::type</tt>) is a model of <a
-href="../../utility/MultiPassInputIterator.html">Multi-Pass Input Iterator</a>
+href="../../butility/MultiPassInputIterator.html">Multi-Pass Input Iterator</a>
 </a>.
 
 
diff --git a/Utilities/BGL/boost/graph/doc/isomorphism-impl-v2.w b/Utilities/BGL/boost/graph/doc/isomorphism-impl-v2.w
index 75f88b2bd605dcb74249bbf08811ac106e5f4d07..0e0031d79d982976a5cd1ac143a885d4347817b3 100644
--- a/Utilities/BGL/boost/graph/doc/isomorphism-impl-v2.w
+++ b/Utilities/BGL/boost/graph/doc/isomorphism-impl-v2.w
@@ -921,7 +921,7 @@ if (verify == true) {
 #include <algorithm>
 #include <boost/graph/iteration_macros.hpp>
 #include <boost/graph/depth_first_search.hpp>
-#include <boost/utility.hpp>
+#include <boost/butility.hpp>
 #include <boost/tuple/tuple.hpp>
 
 namespace boost {
diff --git a/Utilities/BGL/boost/graph/doc/isomorphism-impl-v3.w b/Utilities/BGL/boost/graph/doc/isomorphism-impl-v3.w
index 4ce87517653ac0e2bb928390657ff5a9b440457f..99d8bd56f0726fccb4b5f2380a79bae007ba1c74 100644
--- a/Utilities/BGL/boost/graph/doc/isomorphism-impl-v3.w
+++ b/Utilities/BGL/boost/graph/doc/isomorphism-impl-v3.w
@@ -827,7 +827,7 @@ isomorphism_algo(const Graph1& G1, const Graph2& G2, IsoMapping f,
 #include <algorithm>
 #include <boost/graph/iteration_macros.hpp>
 #include <boost/graph/depth_first_search.hpp>
-#include <boost/utility.hpp>
+#include <boost/butility.hpp>
 #include <boost/detail/algorithm.hpp>
 #include <boost/pending/indirect_cmp.hpp> // for make_indirect_pmap
 
diff --git a/Utilities/BGL/boost/graph/doc/using_adjacency_list.html b/Utilities/BGL/boost/graph/doc/using_adjacency_list.html
index ab607d9ef0364201a679f83a9976294e4a655836..6700b2a83da1cdac71732a6b1c201f5801c29a10 100644
--- a/Utilities/BGL/boost/graph/doc/using_adjacency_list.html
+++ b/Utilities/BGL/boost/graph/doc/using_adjacency_list.html
@@ -411,8 +411,8 @@ specifies the type of the property values. The type <tt>T</tt> must be
 <a
 href="http://www.sgi.com/tech/stl/DefaultConstructible.html">Default
 Constructible</a>, <a
-href="../../utility/Assignable.html">Assignable</a>, and <a
-href="../../utility/CopyConstructible.html">Copy Constructible</a>.
+href="../../butility/Assignable.html">Assignable</a>, and <a
+href="../../butility/CopyConstructible.html">Copy Constructible</a>.
 Like the containers of the C++ Standard Library, the property objects
 of type <tt>T</tt> are held by-value inside of the graph.
 
diff --git a/Utilities/BGL/boost/graph/isomorphism.hpp b/Utilities/BGL/boost/graph/isomorphism.hpp
index 50582a49a629a95f5851ac84be12dde78b797484..f2bec37a99673cab37c5b15f8bfe5e887895a7e9 100644
--- a/Utilities/BGL/boost/graph/isomorphism.hpp
+++ b/Utilities/BGL/boost/graph/isomorphism.hpp
@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <boost/config.hpp>
 #include <boost/graph/depth_first_search.hpp>
-#include <boost/utility.hpp>
+#include <boost/butility.hpp>
 #include <boost/detail/algorithm.hpp>
 #include <boost/pending/indirect_cmp.hpp> // for make_indirect_pmap
 
diff --git a/Utilities/BGL/boost/graph/test/graph.cpp b/Utilities/BGL/boost/graph/test/graph.cpp
index e93956eef466608b5a06fffcffc103e422fe5f07..e8449a565ff052187c77b7926ba57d81118b04ee 100644
--- a/Utilities/BGL/boost/graph/test/graph.cpp
+++ b/Utilities/BGL/boost/graph/test/graph.cpp
@@ -17,7 +17,7 @@
 
 #define VERBOSE 0
 
-#include <boost/utility.hpp>
+#include <boost/butility.hpp>
 #include <boost/graph/graph_utility.hpp>
 #include <boost/graph/random.hpp>
 #include <boost/pending/indirect_cmp.hpp>
diff --git a/Utilities/BGL/boost/graph/test/property_iter.cpp b/Utilities/BGL/boost/graph/test/property_iter.cpp
index e420ffdd8ab47cef6c0e08cb3b30069e46585421..6131e756ca533069ec45739968994c9955abbd72 100644
--- a/Utilities/BGL/boost/graph/test/property_iter.cpp
+++ b/Utilities/BGL/boost/graph/test/property_iter.cpp
@@ -22,7 +22,7 @@
 
 #define VERBOSE 0
 
-#include <boost/utility.hpp>
+#include <boost/butility.hpp>
 #include <boost/graph/property_iter_range.hpp>
 #include <boost/graph/graph_utility.hpp>
 #include <boost/graph/random.hpp>
diff --git a/Utilities/BGL/boost/iterator.hpp b/Utilities/BGL/boost/iterator.hpp
index d3844e71c0df9f073898af5da32436dc81194c43..d5d9f46e949c8200e3bb1ea710b4152a37dad945 100644
--- a/Utilities/BGL/boost/iterator.hpp
+++ b/Utilities/BGL/boost/iterator.hpp
@@ -4,7 +4,7 @@
 //  Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/libs/utility for documentation.
+//  See http://www.boost.org/libs/butility for documentation.
 
 //  Revision History
 //  12 Jan 01 added <cstddef> for std::ptrdiff_t (Jens Maurer)
diff --git a/Utilities/BGL/boost/iterator/reverse_iterator.hpp b/Utilities/BGL/boost/iterator/reverse_iterator.hpp
index 97b6b4861d4555e21b887c9d0a07944960600144..6ecbb0582086d1e9c9b4bdacb0a7f580bf9b12d9 100644
--- a/Utilities/BGL/boost/iterator/reverse_iterator.hpp
+++ b/Utilities/BGL/boost/iterator/reverse_iterator.hpp
@@ -8,7 +8,7 @@
 #define BOOST_REVERSE_ITERATOR_23022003THW_HPP
 
 #include <boost/iterator.hpp>
-#include <boost/utility.hpp>
+#include <boost/butility.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
 
 namespace boost
diff --git a/Utilities/BGL/boost/limits.hpp b/Utilities/BGL/boost/limits.hpp
index f468dbce73970d90f2dbb6caad297a5e98a8d319..0f7a5929325233f9262ff56b0e0f4f6bc9fe23f3 100644
--- a/Utilities/BGL/boost/limits.hpp
+++ b/Utilities/BGL/boost/limits.hpp
@@ -6,7 +6,7 @@
 //
 // use this header as a workaround for missing <limits>
 
-//  See http://www.boost.org/libs/utility/limits.html for documentation.
+//  See http://www.boost.org/libs/butility/limits.html for documentation.
 
 #ifndef BOOST_LIMITS
 #define BOOST_LIMITS
diff --git a/Utilities/BGL/boost/mpl/for_each.hpp b/Utilities/BGL/boost/mpl/for_each.hpp
index b87deb67b0c3762b561d09c80d245294f31efad9..b1138b3df55aa8f98680e2c2de39276bc5765fe7 100644
--- a/Utilities/BGL/boost/mpl/for_each.hpp
+++ b/Utilities/BGL/boost/mpl/for_each.hpp
@@ -23,7 +23,7 @@
 #include <boost/mpl/aux_/unwrap.hpp>
 
 #include <boost/type_traits/is_same.hpp>
-#include <boost/utility/value_init.hpp>
+#include <boost/butility/value_init.hpp>
 
 namespace boost { namespace mpl {
 
diff --git a/Utilities/BGL/boost/next_prior.hpp b/Utilities/BGL/boost/next_prior.hpp
index e1d2e42891976c678a5bd5fe1f1ba86526346e7d..ac130f6c5e4fbe44665285181142531a7b953176 100644
--- a/Utilities/BGL/boost/next_prior.hpp
+++ b/Utilities/BGL/boost/next_prior.hpp
@@ -4,7 +4,7 @@
 //  Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/libs/utility for documentation.
+//  See http://www.boost.org/libs/butility for documentation.
 
 //  Revision History
 //  13 Dec 2003  Added next(x, n) and prior(x, n) (Daniel Walker)
diff --git a/Utilities/BGL/boost/operators.hpp b/Utilities/BGL/boost/operators.hpp
index fbba602384e1f637cfe256ca9546066def7cf4c3..7c80dc4262b52774dc1bd1cd6cfce4313a39b9d6 100644
--- a/Utilities/BGL/boost/operators.hpp
+++ b/Utilities/BGL/boost/operators.hpp
@@ -5,7 +5,7 @@
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/libs/utility/operators.htm for documentation.
+//  See http://www.boost.org/libs/butility/operators.htm for documentation.
 
 //  Revision History
 //  21 Oct 02 Modified implementation of operators to allow compilers with a
diff --git a/Utilities/BGL/boost/optional/optional.hpp b/Utilities/BGL/boost/optional/optional.hpp
index 99f3af028dbcd9fa0b1de5a08dd5e942ef8fe0da..a357dc372c2a7b466f520133961767937e8bb61f 100644
--- a/Utilities/BGL/boost/optional/optional.hpp
+++ b/Utilities/BGL/boost/optional/optional.hpp
@@ -27,7 +27,7 @@
 #include "boost/mpl/not.hpp"
 #include "boost/detail/reference_content.hpp"
 #include "boost/none_t.hpp"
-#include "boost/utility/compare_pointees.hpp"
+#include "boost/butility/compare_pointees.hpp"
 
 #if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
 // VC6.0 has the following bug:
diff --git a/Utilities/BGL/boost/ref.hpp b/Utilities/BGL/boost/ref.hpp
index 3745e7ca0f7d8784c7d17aa40d982f559eb6ab40..c4d40430e666d9eca1dce4bc550ddc850acba1e0 100644
--- a/Utilities/BGL/boost/ref.hpp
+++ b/Utilities/BGL/boost/ref.hpp
@@ -8,7 +8,7 @@
 #endif
 
 #include <boost/config.hpp>
-#include <boost/utility/addressof.hpp>
+#include <boost/butility/addressof.hpp>
 #include <boost/mpl/bool.hpp>
 
 //
diff --git a/Utilities/BGL/boost/spirit.hpp b/Utilities/BGL/boost/spirit.hpp
index cae9ad1552162360c09aa817bde75a9c6f335d12..75b11942c7cd4dc5b6950fb0fff144ef5c877f8a 100644
--- a/Utilities/BGL/boost/spirit.hpp
+++ b/Utilities/BGL/boost/spirit.hpp
@@ -60,7 +60,7 @@
 //  Spirit.Utilities
 //
 ///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/utility.hpp>
+#include <boost/spirit/butility.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////
 //
diff --git a/Utilities/BGL/boost/spirit/utility/chset.hpp b/Utilities/BGL/boost/spirit/butility/chset.hpp
similarity index 97%
rename from Utilities/BGL/boost/spirit/utility/chset.hpp
rename to Utilities/BGL/boost/spirit/butility/chset.hpp
index 4273d1ce24e81b595916f11fe89ab45badff14e6..94fa99fe9023563f1492dd9bf3eb3e0d58ef5ee5 100644
--- a/Utilities/BGL/boost/spirit/utility/chset.hpp
+++ b/Utilities/BGL/boost/spirit/butility/chset.hpp
@@ -13,7 +13,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 #include <boost/shared_ptr.hpp>
 #include <boost/spirit/core/primitives/primitives.hpp>
-#include <boost/spirit/utility/impl/chset/basic_chset.hpp>
+#include <boost/spirit/butility/impl/chset/basic_chset.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit {
@@ -179,5 +179,5 @@ chset_p( ::boost::ulong_long_type ch)
 
 #endif
 
-#include <boost/spirit/utility/impl/chset.ipp>
-#include <boost/spirit/utility/chset_operators.hpp>
+#include <boost/spirit/butility/impl/chset.ipp>
+#include <boost/spirit/butility/chset_operators.hpp>
diff --git a/Utilities/BGL/boost/spirit/utility/chset_operators.hpp b/Utilities/BGL/boost/spirit/butility/chset_operators.hpp
similarity index 99%
rename from Utilities/BGL/boost/spirit/utility/chset_operators.hpp
rename to Utilities/BGL/boost/spirit/butility/chset_operators.hpp
index e1446ff5f7e81e3a28d291721ce426a1ebd66dac..215d20d5aa93e7965f7bc41c1cedda623e4aaf17 100644
--- a/Utilities/BGL/boost/spirit/utility/chset_operators.hpp
+++ b/Utilities/BGL/boost/spirit/butility/chset_operators.hpp
@@ -11,7 +11,7 @@
 #define BOOST_SPIRIT_CHSET_OPERATORS_HPP
 
 ///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/utility/chset.hpp>
+#include <boost/spirit/butility/chset.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit {
@@ -395,4 +395,4 @@ operator^(nothing_parser a, chset<CharT> const& b);
 
 #endif
 
-#include <boost/spirit/utility/impl/chset_operators.ipp>
+#include <boost/spirit/butility/impl/chset_operators.ipp>
diff --git a/Utilities/BGL/boost/spirit/utility/confix.hpp b/Utilities/BGL/boost/spirit/butility/confix.hpp
similarity index 99%
rename from Utilities/BGL/boost/spirit/utility/confix.hpp
rename to Utilities/BGL/boost/spirit/butility/confix.hpp
index d6b48c2e89c406c0ad924fabe103d4f0ca48a060..030ed65fca4ec6c036648d8fcec0c5e9839c291f 100644
--- a/Utilities/BGL/boost/spirit/utility/confix.hpp
+++ b/Utilities/BGL/boost/spirit/butility/confix.hpp
@@ -13,7 +13,7 @@
 #include <boost/config.hpp>
 #include <boost/spirit/meta/as_parser.hpp>
 #include <boost/spirit/core/composite/operators.hpp>
-#include <boost/spirit/utility/impl/confix.ipp>
+#include <boost/spirit/butility/impl/confix.ipp>
 
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit {
diff --git a/Utilities/BGL/boost/spirit/utility/distinct.hpp b/Utilities/BGL/boost/spirit/butility/distinct.hpp
similarity index 99%
rename from Utilities/BGL/boost/spirit/utility/distinct.hpp
rename to Utilities/BGL/boost/spirit/butility/distinct.hpp
index 4e1625f08a1da33d72c4bf8197fb213722f8ab09..c65716ca3c8bae65751220f7b78ad7348f110da2 100644
--- a/Utilities/BGL/boost/spirit/utility/distinct.hpp
+++ b/Utilities/BGL/boost/spirit/butility/distinct.hpp
@@ -16,7 +16,7 @@
 #include <boost/spirit/core/composite/directives.hpp>
 #include <boost/spirit/core/composite/epsilon.hpp>
 #include <boost/spirit/core/non_terminal/rule.hpp>
-#include <boost/spirit/utility/chset.hpp>
+#include <boost/spirit/butility/chset.hpp>
 
 namespace boost {
     namespace spirit {
diff --git a/Utilities/BGL/boost/spirit/utility/escape_char.hpp b/Utilities/BGL/boost/spirit/butility/escape_char.hpp
similarity index 99%
rename from Utilities/BGL/boost/spirit/utility/escape_char.hpp
rename to Utilities/BGL/boost/spirit/butility/escape_char.hpp
index 2db0436ce4d504a52b03d0586191d00b0fda163b..58a7651e4b0cef0ee770c2f73345282f001ba634 100644
--- a/Utilities/BGL/boost/spirit/utility/escape_char.hpp
+++ b/Utilities/BGL/boost/spirit/butility/escape_char.hpp
@@ -17,7 +17,7 @@
 
 #include <boost/spirit/debug.hpp>
 
-#include <boost/spirit/utility/impl/escape_char.ipp>
+#include <boost/spirit/butility/impl/escape_char.ipp>
 
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit {
diff --git a/Utilities/BGL/boost/spirit/utility/flush_multi_pass.hpp b/Utilities/BGL/boost/spirit/butility/flush_multi_pass.hpp
similarity index 100%
rename from Utilities/BGL/boost/spirit/utility/flush_multi_pass.hpp
rename to Utilities/BGL/boost/spirit/butility/flush_multi_pass.hpp
diff --git a/Utilities/BGL/boost/spirit/utility/functor_parser.hpp b/Utilities/BGL/boost/spirit/butility/functor_parser.hpp
similarity index 100%
rename from Utilities/BGL/boost/spirit/utility/functor_parser.hpp
rename to Utilities/BGL/boost/spirit/butility/functor_parser.hpp
diff --git a/Utilities/BGL/boost/spirit/utility/grammar_def.hpp b/Utilities/BGL/boost/spirit/butility/grammar_def.hpp
similarity index 100%
rename from Utilities/BGL/boost/spirit/utility/grammar_def.hpp
rename to Utilities/BGL/boost/spirit/butility/grammar_def.hpp
diff --git a/Utilities/BGL/boost/spirit/utility/impl/chset.ipp b/Utilities/BGL/boost/spirit/butility/impl/chset.ipp
similarity index 99%
rename from Utilities/BGL/boost/spirit/utility/impl/chset.ipp
rename to Utilities/BGL/boost/spirit/butility/impl/chset.ipp
index 91d11a4dcb05c04bd191e35995471c239c708998..e185352dd82e44844dcd7d042b8a39f53deb5fe3 100644
--- a/Utilities/BGL/boost/spirit/utility/impl/chset.ipp
+++ b/Utilities/BGL/boost/spirit/butility/impl/chset.ipp
@@ -12,7 +12,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 #include <boost/limits.hpp>
-#include <boost/spirit/utility/chset.hpp>
+#include <boost/spirit/butility/chset.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit {
diff --git a/Utilities/BGL/boost/spirit/utility/impl/chset/basic_chset.hpp b/Utilities/BGL/boost/spirit/butility/impl/chset/basic_chset.hpp
similarity index 96%
rename from Utilities/BGL/boost/spirit/utility/impl/chset/basic_chset.hpp
rename to Utilities/BGL/boost/spirit/butility/impl/chset/basic_chset.hpp
index 57413dc6ca182e52863ada8f6de0e468a8f51703..c065d7232cc640adea95e138e581e453a93a12a3 100644
--- a/Utilities/BGL/boost/spirit/utility/impl/chset/basic_chset.hpp
+++ b/Utilities/BGL/boost/spirit/butility/impl/chset/basic_chset.hpp
@@ -12,7 +12,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 #include <bitset>
-#include <boost/spirit/utility/impl/chset/range_run.hpp>
+#include <boost/spirit/butility/impl/chset/range_run.hpp>
 
 namespace boost { namespace spirit {
 
@@ -99,4 +99,4 @@ namespace boost { namespace spirit {
 
 #endif
 
-#include <boost/spirit/utility/impl/chset/basic_chset.ipp>
+#include <boost/spirit/butility/impl/chset/basic_chset.ipp>
diff --git a/Utilities/BGL/boost/spirit/utility/impl/chset/basic_chset.ipp b/Utilities/BGL/boost/spirit/butility/impl/chset/basic_chset.ipp
similarity index 99%
rename from Utilities/BGL/boost/spirit/utility/impl/chset/basic_chset.ipp
rename to Utilities/BGL/boost/spirit/butility/impl/chset/basic_chset.ipp
index 9370e3f8ad5f3e2bcfff38bdba848704d8b857ba..01b95120227cfa19667ddb38bf366990bd6849d6 100644
--- a/Utilities/BGL/boost/spirit/utility/impl/chset/basic_chset.ipp
+++ b/Utilities/BGL/boost/spirit/butility/impl/chset/basic_chset.ipp
@@ -12,7 +12,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 #include <bitset>
-#include <boost/spirit/utility/impl/chset/basic_chset.hpp>
+#include <boost/spirit/butility/impl/chset/basic_chset.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit {
diff --git a/Utilities/BGL/boost/spirit/utility/impl/chset/range_run.hpp b/Utilities/BGL/boost/spirit/butility/impl/chset/range_run.hpp
similarity index 98%
rename from Utilities/BGL/boost/spirit/utility/impl/chset/range_run.hpp
rename to Utilities/BGL/boost/spirit/butility/impl/chset/range_run.hpp
index 320e949e1ff7aa5f397d0211fef89e6e5744d36a..55e884dee2be072d86dc7b1cf0d61d0455dd2510 100644
--- a/Utilities/BGL/boost/spirit/utility/impl/chset/range_run.hpp
+++ b/Utilities/BGL/boost/spirit/butility/impl/chset/range_run.hpp
@@ -115,4 +115,4 @@ namespace boost { namespace spirit { namespace utility { namespace impl {
 
 #endif
 
-#include <boost/spirit/utility/impl/chset/range_run.ipp>
+#include <boost/spirit/butility/impl/chset/range_run.ipp>
diff --git a/Utilities/BGL/boost/spirit/utility/impl/chset/range_run.ipp b/Utilities/BGL/boost/spirit/butility/impl/chset/range_run.ipp
similarity index 99%
rename from Utilities/BGL/boost/spirit/utility/impl/chset/range_run.ipp
rename to Utilities/BGL/boost/spirit/butility/impl/chset/range_run.ipp
index 45491bc3fb38380da9922b4628922906158af864..31ef425c8818b9550608341f57f08462f05824b0 100644
--- a/Utilities/BGL/boost/spirit/utility/impl/chset/range_run.ipp
+++ b/Utilities/BGL/boost/spirit/butility/impl/chset/range_run.ipp
@@ -12,7 +12,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 #include <algorithm> // for std::lower_bound
 #include <boost/spirit/core/assert.hpp> // for BOOST_SPIRIT_ASSERT
-#include <boost/spirit/utility/impl/chset/range_run.hpp>
+#include <boost/spirit/butility/impl/chset/range_run.hpp>
 #include <boost/spirit/debug.hpp>
 #include <boost/limits.hpp>
 
diff --git a/Utilities/BGL/boost/spirit/utility/impl/chset_operators.ipp b/Utilities/BGL/boost/spirit/butility/impl/chset_operators.ipp
similarity index 100%
rename from Utilities/BGL/boost/spirit/utility/impl/chset_operators.ipp
rename to Utilities/BGL/boost/spirit/butility/impl/chset_operators.ipp
diff --git a/Utilities/BGL/boost/spirit/utility/impl/confix.ipp b/Utilities/BGL/boost/spirit/butility/impl/confix.ipp
similarity index 100%
rename from Utilities/BGL/boost/spirit/utility/impl/confix.ipp
rename to Utilities/BGL/boost/spirit/butility/impl/confix.ipp
diff --git a/Utilities/BGL/boost/spirit/utility/impl/escape_char.ipp b/Utilities/BGL/boost/spirit/butility/impl/escape_char.ipp
similarity index 100%
rename from Utilities/BGL/boost/spirit/utility/impl/escape_char.ipp
rename to Utilities/BGL/boost/spirit/butility/impl/escape_char.ipp
diff --git a/Utilities/BGL/boost/spirit/utility/impl/lists.ipp b/Utilities/BGL/boost/spirit/butility/impl/lists.ipp
similarity index 100%
rename from Utilities/BGL/boost/spirit/utility/impl/lists.ipp
rename to Utilities/BGL/boost/spirit/butility/impl/lists.ipp
diff --git a/Utilities/BGL/boost/spirit/utility/impl/regex.ipp b/Utilities/BGL/boost/spirit/butility/impl/regex.ipp
similarity index 100%
rename from Utilities/BGL/boost/spirit/utility/impl/regex.ipp
rename to Utilities/BGL/boost/spirit/butility/impl/regex.ipp
diff --git a/Utilities/BGL/boost/spirit/utility/lists.hpp b/Utilities/BGL/boost/spirit/butility/lists.hpp
similarity index 99%
rename from Utilities/BGL/boost/spirit/utility/lists.hpp
rename to Utilities/BGL/boost/spirit/butility/lists.hpp
index 489f2700a67ad36a3471c2344162bb588fc0d783..7e7e4c7cf5f643124d38891a42265df1ee1dc694 100644
--- a/Utilities/BGL/boost/spirit/utility/lists.hpp
+++ b/Utilities/BGL/boost/spirit/butility/lists.hpp
@@ -14,7 +14,7 @@
 #include <boost/spirit/meta/as_parser.hpp>
 #include <boost/spirit/core/parser.hpp>
 #include <boost/spirit/core/composite/composite.hpp>
-#include <boost/spirit/utility/impl/lists.ipp>
+#include <boost/spirit/butility/impl/lists.ipp>
 
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit {
diff --git a/Utilities/BGL/boost/spirit/utility/loops.hpp b/Utilities/BGL/boost/spirit/butility/loops.hpp
similarity index 100%
rename from Utilities/BGL/boost/spirit/utility/loops.hpp
rename to Utilities/BGL/boost/spirit/butility/loops.hpp
diff --git a/Utilities/BGL/boost/spirit/utility/regex.hpp b/Utilities/BGL/boost/spirit/butility/regex.hpp
similarity index 98%
rename from Utilities/BGL/boost/spirit/utility/regex.hpp
rename to Utilities/BGL/boost/spirit/butility/regex.hpp
index ace254322c7f9a1ef83e4082b70110f76f8b6fe2..9066d49020356bfa3fbc4f7f833b96de2fb4df87 100644
--- a/Utilities/BGL/boost/spirit/utility/regex.hpp
+++ b/Utilities/BGL/boost/spirit/butility/regex.hpp
@@ -46,7 +46,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 #include <boost/spirit/meta/as_parser.hpp>
 #include <boost/spirit/core/parser.hpp>
-#include <boost/spirit/utility/impl/regex.ipp>
+#include <boost/spirit/butility/impl/regex.ipp>
 #include <boost/detail/iterator.hpp> // for boost::detail::iterator_traits
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Utilities/BGL/boost/spirit/utility/scoped_lock.hpp b/Utilities/BGL/boost/spirit/butility/scoped_lock.hpp
similarity index 100%
rename from Utilities/BGL/boost/spirit/utility/scoped_lock.hpp
rename to Utilities/BGL/boost/spirit/butility/scoped_lock.hpp
diff --git a/Utilities/BGL/boost/spirit/fusion/iterator/deref.hpp b/Utilities/BGL/boost/spirit/fusion/iterator/deref.hpp
index 2c624f8ac4b05a4a422387bed1fdbc7e8b5d7497..e1db673275d40234616fd2c4ab2066f701c8a393 100644
--- a/Utilities/BGL/boost/spirit/fusion/iterator/deref.hpp
+++ b/Utilities/BGL/boost/spirit/fusion/iterator/deref.hpp
@@ -12,7 +12,7 @@
 #include <boost/spirit/fusion/detail/config.hpp>
 #include <boost/spirit/fusion/iterator/detail/iterator_base.hpp>
 #include <boost/spirit/fusion/iterator/as_fusion_iterator.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/butility/enable_if.hpp>
 #include <boost/type_traits/is_const.hpp>
 
 namespace boost { namespace fusion
diff --git a/Utilities/BGL/boost/spirit/fusion/sequence/equal_to.hpp b/Utilities/BGL/boost/spirit/fusion/sequence/equal_to.hpp
index da2f4c64d4648099e27979a62b99103b741d127f..608f70287b56f5884cf675b17403b1fcbb1963f7 100644
--- a/Utilities/BGL/boost/spirit/fusion/sequence/equal_to.hpp
+++ b/Utilities/BGL/boost/spirit/fusion/sequence/equal_to.hpp
@@ -14,7 +14,7 @@
 #include <boost/spirit/fusion/sequence/detail/sequence_equal_to.hpp>
 
 #ifdef FUSION_COMFORMING_COMPILER
-#include <boost/utility/enable_if.hpp>
+#include <boost/butility/enable_if.hpp>
 #include <boost/spirit/fusion/sequence/is_sequence.hpp>
 #include <boost/spirit/fusion/sequence/as_fusion_sequence.hpp>
 #endif
diff --git a/Utilities/BGL/boost/spirit/fusion/sequence/greater.hpp b/Utilities/BGL/boost/spirit/fusion/sequence/greater.hpp
index c52515c26b93ff7684906612678a302125411eb7..799efb532f59dfb44877b3c622952038abefecda 100644
--- a/Utilities/BGL/boost/spirit/fusion/sequence/greater.hpp
+++ b/Utilities/BGL/boost/spirit/fusion/sequence/greater.hpp
@@ -14,7 +14,7 @@
 #include <boost/spirit/fusion/sequence/detail/sequence_greater.hpp>
 
 #ifdef FUSION_COMFORMING_COMPILER
-#include <boost/utility/enable_if.hpp>
+#include <boost/butility/enable_if.hpp>
 #include <boost/spirit/fusion/sequence/is_sequence.hpp>
 #include <boost/spirit/fusion/sequence/as_fusion_sequence.hpp>
 #endif
diff --git a/Utilities/BGL/boost/spirit/fusion/sequence/greater_equal.hpp b/Utilities/BGL/boost/spirit/fusion/sequence/greater_equal.hpp
index cd3e5dc56cc40fe7e450e064eeb10e4cb7b2f2f8..c3fbdd7f08040db7ded9741ccd4a6ec3ef66ae16 100644
--- a/Utilities/BGL/boost/spirit/fusion/sequence/greater_equal.hpp
+++ b/Utilities/BGL/boost/spirit/fusion/sequence/greater_equal.hpp
@@ -14,7 +14,7 @@
 #include <boost/spirit/fusion/sequence/detail/sequence_greater_equal.hpp>
 
 #ifdef FUSION_COMFORMING_COMPILER
-#include <boost/utility/enable_if.hpp>
+#include <boost/butility/enable_if.hpp>
 #include <boost/spirit/fusion/sequence/is_sequence.hpp>
 #include <boost/spirit/fusion/sequence/as_fusion_sequence.hpp>
 #endif
diff --git a/Utilities/BGL/boost/spirit/fusion/sequence/less.hpp b/Utilities/BGL/boost/spirit/fusion/sequence/less.hpp
index 3b176b3f2e8596a3b4aa53e12ebf2455f098e1c0..26809677c6f746c1146f8e564ff9123a8014f868 100644
--- a/Utilities/BGL/boost/spirit/fusion/sequence/less.hpp
+++ b/Utilities/BGL/boost/spirit/fusion/sequence/less.hpp
@@ -14,7 +14,7 @@
 #include <boost/spirit/fusion/sequence/detail/sequence_less.hpp>
 
 #ifdef FUSION_COMFORMING_COMPILER
-#include <boost/utility/enable_if.hpp>
+#include <boost/butility/enable_if.hpp>
 #include <boost/spirit/fusion/sequence/is_sequence.hpp>
 #include <boost/spirit/fusion/sequence/as_fusion_sequence.hpp>
 #endif
diff --git a/Utilities/BGL/boost/spirit/fusion/sequence/less_equal.hpp b/Utilities/BGL/boost/spirit/fusion/sequence/less_equal.hpp
index 445f0e741a07a82099da71d0023339c9c1c97c7f..2c03c60f26629f7eab6673378b0d070a37168f0b 100644
--- a/Utilities/BGL/boost/spirit/fusion/sequence/less_equal.hpp
+++ b/Utilities/BGL/boost/spirit/fusion/sequence/less_equal.hpp
@@ -14,7 +14,7 @@
 #include <boost/spirit/fusion/sequence/detail/sequence_less_equal.hpp>
 
 #ifdef FUSION_COMFORMING_COMPILER
-#include <boost/utility/enable_if.hpp>
+#include <boost/butility/enable_if.hpp>
 #include <boost/spirit/fusion/sequence/is_sequence.hpp>
 #include <boost/spirit/fusion/sequence/as_fusion_sequence.hpp>
 #endif
diff --git a/Utilities/BGL/boost/spirit/fusion/sequence/not_equal_to.hpp b/Utilities/BGL/boost/spirit/fusion/sequence/not_equal_to.hpp
index cdaf5c839c360b084864c2e5b66074c16092ac1c..9db395f585f9f461a9c1d96145fb106071c8a1fc 100644
--- a/Utilities/BGL/boost/spirit/fusion/sequence/not_equal_to.hpp
+++ b/Utilities/BGL/boost/spirit/fusion/sequence/not_equal_to.hpp
@@ -14,7 +14,7 @@
 #include <boost/spirit/fusion/sequence/detail/sequence_not_equal_to.hpp>
 
 #ifdef FUSION_COMFORMING_COMPILER
-#include <boost/utility/enable_if.hpp>
+#include <boost/butility/enable_if.hpp>
 #include <boost/spirit/fusion/sequence/is_sequence.hpp>
 #include <boost/spirit/fusion/sequence/as_fusion_sequence.hpp>
 #endif
diff --git a/Utilities/BGL/boost/spirit/fusion/sequence/tuple10.hpp b/Utilities/BGL/boost/spirit/fusion/sequence/tuple10.hpp
index 713e7c2f4e610f4edc25cf4414d8d0b3ede20c9e..a22682cd3bb086f43ad5de48fdeed62702e8f10c 100644
--- a/Utilities/BGL/boost/spirit/fusion/sequence/tuple10.hpp
+++ b/Utilities/BGL/boost/spirit/fusion/sequence/tuple10.hpp
@@ -16,7 +16,7 @@
 #include <boost/mpl/int.hpp>
 #include <boost/mpl/vector/vector10.hpp>
 #include <boost/mpl/if.hpp>
-#include <boost/utility/addressof.hpp>
+#include <boost/butility/addressof.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/Utilities/BGL/boost/spirit/utility.hpp b/Utilities/BGL/boost/spirit/utility.hpp
index 6fdf7ba8350fcbde8eb6f5c0e8735aa2c76c65f2..e1018da2cc09d29f749bb310358d4fc7e1e7ec00 100644
--- a/Utilities/BGL/boost/spirit/utility.hpp
+++ b/Utilities/BGL/boost/spirit/utility.hpp
@@ -24,18 +24,18 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // Utility.Parsers
-#include <boost/spirit/utility/chset.hpp>
-#include <boost/spirit/utility/chset_operators.hpp>
-#include <boost/spirit/utility/escape_char.hpp>
-#include <boost/spirit/utility/functor_parser.hpp>
-#include <boost/spirit/utility/loops.hpp>
-#include <boost/spirit/utility/confix.hpp>
-#include <boost/spirit/utility/lists.hpp>
-#include <boost/spirit/utility/distinct.hpp>
+#include <boost/spirit/butility/chset.hpp>
+#include <boost/spirit/butility/chset_operators.hpp>
+#include <boost/spirit/butility/escape_char.hpp>
+#include <boost/spirit/butility/functor_parser.hpp>
+#include <boost/spirit/butility/loops.hpp>
+#include <boost/spirit/butility/confix.hpp>
+#include <boost/spirit/butility/lists.hpp>
+#include <boost/spirit/butility/distinct.hpp>
 
 // Utility.Support
-#include <boost/spirit/utility/flush_multi_pass.hpp>
-#include <boost/spirit/utility/scoped_lock.hpp>
+#include <boost/spirit/butility/flush_multi_pass.hpp>
+#include <boost/spirit/butility/scoped_lock.hpp>
 
 
 #endif // !defined(BOOST_SPIRIT_UTILITY_MAIN_HPP)
diff --git a/Utilities/BGL/boost/throw_exception.hpp b/Utilities/BGL/boost/throw_exception.hpp
index bb79a37d8afc01565e5e8044c36f18d50e07a800..85a36454a08d9798aa0a4a51167c801d1ea8e8b2 100644
--- a/Utilities/BGL/boost/throw_exception.hpp
+++ b/Utilities/BGL/boost/throw_exception.hpp
@@ -16,7 +16,7 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 //
-//  http://www.boost.org/libs/utility/throw_exception.html
+//  http://www.boost.org/libs/butility/throw_exception.html
 //
 
 #include <boost/config.hpp>
diff --git a/Utilities/BGL/boost/utility.hpp b/Utilities/BGL/boost/utility.hpp
index 211d89d67ef6495dabc753db1c1fb75f32ad00be..02ca546ed9d376ac648d42eef7b8233f1bf20d4d 100644
--- a/Utilities/BGL/boost/utility.hpp
+++ b/Utilities/BGL/boost/utility.hpp
@@ -4,14 +4,14 @@
 //  subject to the Boost Software License, Version 1.0.  (See accompanying file
 //  LICENSE_1_0.txt or a copy at <http://www.boost.org/LICENSE_1_0.txt>.)
 
-//  See <http://www.boost.org/libs/utility/> for the library's home page.
+//  See <http://www.boost.org/libs/butility/> for the library's home page.
 
 #ifndef BOOST_UTILITY_HPP
 #define BOOST_UTILITY_HPP
 
-#include <boost/utility/addressof.hpp>
-#include <boost/utility/base_from_member.hpp>  
-#include <boost/utility/enable_if.hpp>
+#include <boost/butility/addressof.hpp>
+#include <boost/butility/base_from_member.hpp>  
+#include <boost/butility/enable_if.hpp>
 #include <boost/checked_delete.hpp>
 #include <boost/next_prior.hpp>
 #include <boost/noncopyable.hpp>
diff --git a/Utilities/ITK/Code/BasicFilters/itkCannyEdgeDetectionImageFilter.h b/Utilities/ITK/Code/BasicFilters/itkCannyEdgeDetectionImageFilter.h
index ba2a48e1574099b4d5b4cf8f093a9b963620be8c..30e4c89750178338fe1e6a969e2571f3502ea82c 100644
--- a/Utilities/ITK/Code/BasicFilters/itkCannyEdgeDetectionImageFilter.h
+++ b/Utilities/ITK/Code/BasicFilters/itkCannyEdgeDetectionImageFilter.h
@@ -194,14 +194,14 @@ public:
     return this->m_Threshold; 
     }
 
-  ///* Set the Threshold value for detected edges. */
+  /** Set the Threshold value for detected edges. */
   itkSetMacro(UpperThreshold, OutputImagePixelType );
   itkGetConstMacro(UpperThreshold, OutputImagePixelType);
 
   itkSetMacro(LowerThreshold, OutputImagePixelType );
   itkGetConstMacro(LowerThreshold, OutputImagePixelType);
 
-  /* Set the Thresholdvalue for detected edges. */
+  /** Set the Thresholdvalue for detected edges. */
   itkSetMacro(OutsideValue, OutputImagePixelType);
   itkGetConstMacro(OutsideValue, OutputImagePixelType);