Thu Feb 25 17:33:59 UTC 2010 Chad Beaulac <chad@objectivesolutions.com>

   * ...
     Merged files from trunk for Bugzilla #3334 branch work-in-progress

142 files changed, 3772 insertions, 852 deletions

diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index e3e9a3b07a5..5c3fdd59458 100644
--- a/ACE-INSTALL.html
+++ b/ACE-INSTALL.html
@@ -154,7 +154,7 @@ document</a>.</p><p>
     <th>Remedy IT</th>
     <td>Maintains ACE on many platforms required for their ACE and
         TAO service offerings. We support AIX,  
-        CodeGear C++ Builder 2007/2009, CodeGear RAD Studio 2007, 
+        CodeGear C++ Builder 2007/2009, CodeGear RAD Studio 2007, Embarcadero C++ Builder 2010,
         CBuilderX 1.0, Windows CE, MinGW, Microsoft Visual C++ 7.1/8/9, GCC,
         Cygwin, VxWorks 5.5.x - 6.x (kernel and rtp), OpenVMS 8.2-1 &            8.3 on Alpha and IA64,
         BlueCAT Linux, RedHat Linux, Fedora, MacOSX, Solaris, 
@@ -798,6 +798,8 @@ to check <a href="#win32nonic">here</a> first. <p>
       <br>
       <code>set PATH=C:\ACE_wrappers\lib;C:\ACE_wrappers\bin;%PATH%</code><br>
       <br>
+  </li><li>Generate the bmake makefiles using <a href="#MPC">MPC</a>. Use the <code>bmake</code> project type for C++ Builder.
+      <br><br>
   </li><li>Change to the ACE_ROOT\ace directory.<br>
       <br>
   </li><li>Build release DLLs for ACE by going:<br>
@@ -834,7 +836,7 @@ to check <a href="#win32nonic">here</a> first. <p>
 
 Note that when you run <code>make</code> in a sub directory you give <code>make -f Makefile.bmak all</code>. The <code>all</code> is needed to make sure the complete project is build.<p>
 
-The Borland/CodeGear C++ Builder 4.0/5.0/6.0/2006/2007/2009 port has been done by Jody Hagins, <a href="mailto:chris@kohlhoff.com">Christopher Kohlhoff</a> and <a href="mailto:jwillemsen@remedy.nl">Johnny Willemsen</a>. </p><p>
+The Borland/CodeGear C++ Builder 4.0/5.0/6.0/2006/2007/2009/2010 port has been done by Jody Hagins, <a href="mailto:chris@kohlhoff.com">Christopher Kohlhoff</a> and <a href="mailto:jwillemsen@remedy.nl">Johnny Willemsen</a>. </p><p>
 
 <b>ACE TESTS</b></p><p>
 
@@ -2463,6 +2465,29 @@ perl bin/mwc.pl  -type vc71 -relative ACE_ROOT=C:/ace/ACE_wrappers -relative TAO
         &lt;<a href="mailto:j.zorko@att.net">j.zorko@att.net</a>&gt; is
         only one of them.</p>
 
+</p></li><li><strong>iPhone/iPod Touch/iPad</strong><p>
+
+        </p><p>ACE builds and runs on the iPhone/iPod Touch/iPad Hardware 
+        and Simulator. Keep in mind that ACE/TAO needs to be built
+        statically since Apple does not allow third party dynamic libraries
+        to be deployed on the hardware. The following are needed to build ACE:</p>
+
+        <p>1. The iPhone SDK.</p>
+        <p>2. When creating $ACE_ROOT/ace/config.h, include
+        config-macosx-iphone-hardware.h if you want to deploy on the 
+        hardware, include config-macosx-iphone-simulator.h if you want
+        to deploy on the simulator. Even though those includes are named
+        after the iPhone, the includes work for iPhone/iPod Touch, and iPad.</p>
+        <p>3. You need to define two environment variables. The first is
+        IPHONE_TARGET. Set IPHONE_TARGET to SIMULATOR if you want to deploy
+        on SIMULATOR. Set IPHONE_TARGET to HARDWARE if you want to deploy on
+        the hardware device.</p> 
+        <p>4. When creating $ACE_ROOT/include/makeinclude/platform_macros.GNU,
+        include 'include $(ACE_ROOT)/include/makeinclude/platform_macosx_iphone.GNU'
+        in the file.</p>
+        
+       
+
 </li></ul>
 
 
diff --git a/ASNMP/asnmp/address.cpp b/ASNMP/asnmp/address.cpp
index edc46f00e3c..fc509f8d978 100644
--- a/ASNMP/asnmp/address.cpp
+++ b/ASNMP/asnmp/address.cpp
@@ -312,7 +312,8 @@ IpAddress::~IpAddress()
 int IpAddress::is_loopback() const
 {
  if (valid()) {
-   return (*(u_long *)&address_buffer == INADDR_LOOPBACK);
+   u_long *pl = (u_long *)&address_buffer;
+   return (*pl == INADDR_LOOPBACK);
  }
   return 0;
 }
@@ -320,7 +321,8 @@ int IpAddress::is_loopback() const
 int IpAddress::is_multicast() const
 {
  if (valid()) {
-   return (IN_MULTICAST(*(u_long *)&address_buffer));
+   u_long *pl = (u_long *)&address_buffer;
+   return (IN_MULTICAST(*pl));
  }
   return 0;
 }
@@ -358,7 +360,8 @@ void IpAddress::to_octet(OctetStr& octet) const
 int IpAddress::is_broadcast() const
 {
  if (valid()) {
-   return ( (*(u_long *)&address_buffer) & INADDR_BROADCAST);
+   u_long *pl = (u_long *)&address_buffer;
+   return ( (*pl) & INADDR_BROADCAST);
  }
   return 0;
 }
diff --git a/ChangeLog b/ChangeLog
index 7bcf2d45193..f3a90ef20ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,1595 @@
+Thu Feb 25 16:52:20 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * ace/Strategies_T.cpp:
+        * ace/Connector.cpp:
+        * ace/Svc_Handler.cpp:
+        * tests/run_test.lst:
+        * tests/Bug_2609_Regression_Test.cpp:
+        * tests/NonBlocking_Conn_Test.h:
+        * tests/Bug_2610_Regression_Test.cpp:
+        * tests/Process_Strategy_Test.cpp:
+        * tests/NonBlocking_Conn_Test.cpp:
+          Reverted all the changes done in attempt to fix non-blocking
+          connect test and tests for 2609/2610.
+
+Thu Feb 25 08:10:54 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-opensd.h:
+          #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL
+
+Thu Feb 25 08:10:54 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-netbsd.h:
+          #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL
+
+Thu Feb 25 07:51:54 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-WinCE.h:
+          #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL
+
+Thu Feb 25 07:38:54 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/svcconf.mpb:
+        * ace/svcconfgen.mpc:
+          Moved regeneration support to its own file that is disabled by
+          defeault. Thanks to Joseph Sarbak <Joseph dot Sarbak at rbccm dot com>
+          for reporting this.
+
+        * bin/MakeProjectCreator/config/global.features:
+          Set ace_svcconf_gen to 0, when this is set to 1 we enable svcconf
+          regeneration
+
+Wed Feb 24 22:07:30 UTC 2010  Steven Stallion  <stallions@ociweb.com>
+
+        * include/makeinclude/platform_sunos5_sunc++.GNU:
+          Added support for alternate CC libraries.
+
+Wed Feb 24 15:15:00 UTC 2010  Simon Massey  <sma at prismtech dot com>
+
+        * ace/config-lynxos.h:
+          #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL
+          Correct placement of these defines for the version of Lynxos
+
+Wed Feb 24 11:41:54 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_g++_common.GNU:
+          Added support for no_strict_aliasing, when this is set, we add
+          -fno-strict-aliasing to the compiler flags
+
+Wed Feb 24 08:45:54 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/run_test.lst:
+          2434 should run now
+
+Wed Feb 24 08:41:54 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-hpux-11.00.h:
+          #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL
+
+Wed Feb 24 08:01:54 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/NonBlocking_Conn_Test.cpp:
+          Unicode fixes
+
+        * tests/Atomic_Op_Test.cpp:
+          Calculate how long each test takes and print this to the log
+
+Wed Feb 24 02:48:37 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/config-sunos5.5.h:
+          #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL
+
+Tue Feb 23 19:45:39 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * tests/OS_Test.cpp: Added tests for floorl() and ceill().  Thanks
+          to Olivier Langlois <olivier at olivierlanglois dot net> for
+          this fix.
+
+Tue Feb 23 19:43:36 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * configure.ac: Added a check for ACE_CHECK_LACKS_FUNCS(floor ceil
+          floorl ceill).  Thanks to Olivier Langlois <olivier at
+          olivierlanglois dot net> for this fix.
+
+Tue Feb 23 15:15:00 UTC 2010  Simon Massey  <sma at prismtech dot com>
+
+        * ace/config-lynxos.h:
+          #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL
+
+Tue Feb 23 08:59:54 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-vxworks6.4.h:
+          VxWorks lacks floorl and ceill
+
+Mon Feb 22 20:01:54 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Time_Value.{h,cpp}: Applied some patches from Olivier Langlois
+          <olivier at olivierlanglois dot net> to fix some warnings.
+
+Mon Feb 22 19:57:02 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Thread_Mutex.inl (ACE_Thread_Mutex::lock): Added a non-const
+          lock() method.  Thanks to Phil for suggesting this.
+
+Mon Feb 22 18:08:20 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Condition_Recursive_Thread_Mutex.cpp (ACE_Condition): Fixed
+          a stray occurrence of the mutex() accessor that should be
+          lock().  Thanks to Phil Mesnier for reporting this.
+
+Mon Feb 22 15:00:11 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Time_Value.{h,cpp}: Reformatted/renamed the code to conform
+          to ACE programming guidelines.
+
+Mon Feb 22 13:40:14 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Condition_T.cpp: Changed the mutex() accessor to lock() to
+          be consistent.
+
+Mon Feb 22 13:39:09 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Recursive_Thread_Mutex.{h,inl}: Created a new lock() accessor
+          so it's consistent with the other synchronizer accessors in ACE.
+
+Sun Feb 21 21:25:21 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * tests/Time_Value_Test.cpp: Added a test for the new operator<<
+          implementation for ACE_Time_Value.  Thanks to Olivier Langlois
+          <olivier at olivierlanglois dot net> for contributing this.
+
+Sun Feb 21 21:28:03 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/OS_NS_math.{h,inl}: Added support for floor() and ceiling()
+          for long double types.  Thanks to Olivier Langlois <olivier at
+          olivierlanglois dot net> for contributing this.
+
+        * ace/Time_Value.{h,cpp}: Added support for operator<< and to
+          handle long double values better.  Thanks to Olivier Langlois
+          <olivier at olivierlanglois dot net> for contributing this.
+          This fixes bugid 3818 and 2434.
+
+Sun Feb 21 16:28:47 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * tests/Recursive_Condition_Test.cpp: Revised this test so that it
+          actually uses the ACE_Condition<> template, like it says in the
+          comments..
+
+Sun Feb 21 16:20:35 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Condition_T.cpp (ACE_Condition<MUTEX>::wait): Changed the
+          call to mutex_.lock_ to mutex_.mutex() since lock_ is protected.
+          Thanks to Nick Meyer <nick dot meyer at sensis dot com> for
+          reporting this.
+
+Sun Feb 21 09:24:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ChangeLogs/*:
+          Use full year
+
+Sat Feb 20 20:26:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/global.features:
+          Also set dds4ccm_splie to 0 by default
+
+Fri Feb 19 19:34:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/global.features:
+          Set dds4ccm_opendds and dds4ccm_ndds to 0 by default. When
+          generating project files for dds4ccm we now have to enable
+          which dds implementation we want to use
+
+Wed Feb 17 10:02:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * html/Stats/index.shtml:
+          Added link for MPC440 Xampler results
+
+Tue Feb 16 09:51:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_freebsd.GNU:
+        * include/makeinclude/platform_linux_common.GNU:
+          Set fox flags
+
+        * include/makeinclude/platform_gnuwin32_common.GNU:
+          enabled no_hidden_visibility
+
+Mon Feb 15 19:28:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * rpmbuild/ace-tao.spec:
+          Package nslist and catior readme files
+
+Mon Feb 15 12:10:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * debianbuild/rules:
+          Removed some not needed steps
+
+Mon Feb 15 09:56:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * configure.ac:
+          Fixed problem with latest autoconf tools
+
+        * patches/97-fix-empty-elseif.dpatch:
+          Removed, not needed anymore
+
+Mon Feb 15 09:44:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * debianbuild/patches/02-fltk-no-gl.dpatch
+        * debianbuild/patches/12-fix-fox-include.dpatch
+        * debianbuild/patches/13-fix-fox-errors.dpatch
+        * debianbuild/patches/14-autoconf-tao.dpatch
+        * debianbuild/patches/26-autoupdate.diff
+        * debianbuild/patches/35-autoconf-fix-else-fi.dpatch
+        * debianbuild/patches/36-autoconf-fix-fidone.dpatch
+        * debianbuild/patches/93-hack-to-fix-libtoolize.dpatch
+        * debianbuild/patches/98-ignore-win32-acdefun-error.diff
+        * debianbuild/patches/98-ignore-win32-acdefun-error.dpatch
+          Removed, not needed anymore, merged changes to trunk
+
+Mon Feb 15 09:40:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * include/makeinclude/platform_linux.GNU:
+
+          Added support for cpumodelflag (-mcpu=) and tunemodelflag (-mtune=) flags.
+
+Mon Feb 15 09:38:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * m4/ace.m4:
+          No need to link ftlk with gl
+
+Mon Feb 15 09:35:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/FoxReactor/FoxReactor.h:
+          User has to specify the full fox path now, some distributions now ship fox-1.6 and
+          fox-1.4 as directory names
+
+Mon Feb 15 09:20:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * m4/ace_defines.m4:
+          Fixed fixes with latest releases of tools
+
+        * m4/tao.m4:
+          Added here from TAO to get the distribution to work with the latest
+          versions of autoconf tools
+
+Mon Feb 15 06:49:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * configure.ac:
+          Fixed fixes with latest releases of tools
+
+Sun Feb 14 19:46:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * configure.ac:
+        * m4/ace.m4:
+          Integrated patches from below, created by Pau Garcia i Quiles
+          <pgquiles at elpauer dot org>
+
+        * debianbuild/patches/19-gcc43.dpatch:
+          Removed, not needed anymore
+
+        * debianbuild/patches/94-build-crosscompile.dpatch:
+        * debianbuild/patches/96-build-athena3d.dpatch:
+          Removed, integrated into trunk
+
+Sun Feb 14 07:22:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * debianbuild/*:
+          Imported last version from Pau Garcia i Quiles
+
+Sat Feb 13 15:59:26 UTC 2010  James H. Hill  <hillj at cs dot iupui dot edu>
+
+        * ace/Unbounded_Set_Ex.h:
+
+          Added STL iterator type traits support to the ACE_Unbounded_Set*
+          and its corresponding iterators.
+
+Fri Feb 12 19:19:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Atomic_Op.h:
+        * ace/Containers_T.h:
+          Doxygen changes
+
+Fri Feb 12 17:39:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/run_test.lst:
+          2610 is working now
+
+Fri Feb 12 14:05:21 UTC 2010  Steve Huston  <shuston@riverace.com>
+
+        * ace/Dev_Poll_Reactor.cpp: Fix unused variable warning.
+
+Fri Feb 12 10:36:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-g++-common.h:
+          Expanded autodetected support for GCC builtin __sync_XXX
+          atomic op functions to the IA64 platform
+
+Thu Feb 11 22:23:08 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
+
+        * THANKS:
+
+          Added Trent Nadeau <Trent dot Nadeau at ngc dot com> to the
+          hall of fame.
+
+Thu Feb 11 20:29:06 UTC 2010  Steven Stallion  <stallions@ociweb.com>
+
+        * bin/MakeProjectCreator/config/global.features:
+
+          Disabled wireshark feature by default.
+
+Thu Feb 11 19:52:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * ace/config-g++-common.h:
+
+          Expanded autodetected support for GCC builtin __sync_XXX
+          atomic op functions to all powerpc platforms.
+
+Thu Feb 11 12:18:24 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * ace/Connector.cpp:
+          Added a call to remove_reference() for a svc handler owned by
+          non-blocking connection handler during connector's close().
+
+        * ace/Svc_Handler.cpp:
+          Removed the code that removes a reference to itself. Svc_Handler
+          doesn't own that reference and thus shouldn't remove it.
+
+        * tests/Bug_2609_Regression_Test.cpp:
+        * tests/NonBlocking_Conn_Test.h:
+        * tests/Bug_2610_Regression_Test.cpp:
+        * tests/NonBlocking_Conn_Test.cpp:
+          Fixed the tests that implicitly assumed ownership of a reference
+          to a svc handler and didn't free it at the end of the test.
+
+        * tests/Process_Strategy_Test.cpp:
+          Fixed the test that was broken by my change on
+          'Mon Feb  8 16:21:06 UTC 2010'. The test incorrectly assumed
+          that close_handle() will not be called for svc handlers in
+          a parent process.
+
+Wed Feb 10 18:39:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * ace/config-g++-common.h:
+
+          Added logic to detect (usable) support for GCC builtin __sync_XXX
+          atomic op functions.
+
+        * ace/Atomic_Op.h:
+        * ace/Atomic_Op.inl:
+
+          Changed autodetection for GCC builtin atomic ops so it will
+          only be used when really wanted.
+          Removed include for stdatomic.h because that has nothing to do with
+          the __sync_XXX builtins but rather with a *proposed* atomic op
+          implementation for the C++1x standard. The __sync_XXX builtins are
+          truly intrinsic, i.e. no header files involved.
+
+Wed Feb 10 15:38:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE-INSTALL.html:
+          Updated C++ builder support
+
+Wed Feb 10 10:53:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/run_test.lst:
+          Marked 2610 as not fixed
+
+        * tests/Process_Strategy_Test.cpp:
+          Use prefix increment
+
+Wed Feb 10 10:45:00 UTC 2010  Simon Massey  <sma at prismtech dot com>
+
+        * tests/NonBlocking_Conn_Test.h:
+        * tests/NonBlocking_Conn_Test.cpp:
+          Fixed a VC9 compilation error (IGNORE is a vc9 #define).
+
+Tue Feb  9 15:03:35 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * tests/NonBlocking_Conn_Test.cpp (hosts): Updated the list of hosts to
+          check to include news.bbc.co.uk.
+
+Tue Feb  9 09:14:48 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tests/NonBlocking_Conn_Test.h:
+          Fixed a compilation error.
+
+Mon Feb  8 18:53:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/run_test.lst:
+          Enabled 2609 and 2610 again, let us see how they run with the recent
+          changes from Vladimir
+
+Mon Feb  8 16:21:06 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * ace/Strategies_T.cpp:
+          Changed the code so that close() is called in case of failure
+          instead of destroy().
+
+        * ace/Connector.cpp:
+          Changed a bit the code added by me on 'Wed Sep  2 14:45:27 UTC 2009'
+          as a fix for bug#3731. After some more thinking it turned out that
+          the original code could result in a crash when reference counting is
+          not enabled and thus svc_handler could be destroyed at the time
+          when there was an attempt to do remove_reference().
+
+        * ace/Svc_Handler.cpp:
+          Moved the code added by me on 'Thu Feb  4 11:15:57 UTC 2010'
+          from destroy() to handle_close().
+
+        * tests/NonBlocking_Conn_Test.h:
+        * tests/NonBlocking_Conn_Test.cpp:
+          Extended the test for using Svc_Handler with and without
+          reference counting.
+
+Mon Feb  8 11:35:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/ACETAOCIAO.style:
+          Updated with version 1.17 of Profactor Sylemanager
+
+Mon Feb  8 10:33:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * ace/ETCL/ETCL_l.cpp:
+          Fixed new GCC 4.4.x warning about ignoring return values of
+          function marked by the new warn_unused_result attribute.
+
+Sat Feb  6 18:58:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * include/makeinclude/wrapper_macros.GNU:
+          Fixed missing definitions for Icecream support.
+
+Sat Feb  6 15:03:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * include/makeinclude/wrapper_macros.GNU:
+          Added support for Icecream distributed compile system.
+
+Sat Feb  6 12:58:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Reactor_Performance_Test.cpp:
+        * tests/Reactor_Fairness_Test.cpp:
+        * ASNMP/asnmp/address.cpp:
+        * examples/Reactor/Misc/pingpong.cpp:
+          More fixes for strict-aliasing warnings.
+
+Sat Feb  6 11:28:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * ace/LSOCK.cpp:
+          Fixes for strict-aliasing warnings.
+
+Thu Feb  4 20:29:52 UTC 2010  Steve Huston  <shuston@riverace.com>
+
+        * tests/Reactor_Fairness_Test.cpp: Don't try ACE_Dev_Poll_Reactor on
+          platforms without that capability; also added ACE_WFMO_Reactor to
+          the test (which triggered a crash shutting down WFMO_Reactor... I'm
+          looking into it).
+
+Thu Feb  4 15:32:24 UTC 2010  Steve Huston  <shuston@riverace.com>
+
+        * tests/Reactor_Fairness_Test.cpp:
+        * tests/Reactor_Fairness_Test.h:
+        * tests/Makefile.am:
+        * tests/tests.mpc:
+        * tests/run_test.lst: New test to verify reactor fairness across a
+          set of registered I/O sockets. Tests Select, TP, Dev_Poll now.
+          TP fails fairness tests per Bugzilla 1031. Since the TP fairness
+          failure is a known issue, the new test is marked !FIXED_BUGS_ONLY.
+
+        * ace/Dev_Poll_Reactor.cpp:
+        * ace/Dev_Poll_Reactor.h: Two performance improvements to resolve
+          Bugzilla #3714:
+            1. The notify handler is no longer suspended/resumed around
+               notify processing. This removes the biggest source of CPU
+               consumption introduced at ACE 5.7 - simply acquiring/releasing
+               the token to handle notifies, each of which triggered another
+               token acquire/notify cycle.
+            2. As I/O handlers are suspended before callback, they are not
+               immediately resumed on callback return. Instead, they are added
+               to a "to be resumed" list that is examined just prior to the
+               next epoll_wait() call; any to-be-resumed handles are added
+               back to the epoll set just before waiting. This removes another
+               need to acquire the token just to resume a handler.
+
+Thu Feb  4 11:15:57 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * ace/Svc_Handler.cpp:
+          Fixed an unconditional delete of Svc_Handler in destroy(). If
+          reference counting is enabled then it has to do remove_reference().
+          This completes the fix for bug#3731.
+
+        * tests/NonBlocking_Conn_Test.cpp:
+          Changed www.pakarmy.gov.pk to www.pakistanarmy.gov.pk. The first
+          URL seems to be dead.
+
+Thu Feb  4 10:53:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * bin/PerlACE/Process_Unix.pm:
+
+          Fixed problems concerning correct retrievel of process list.
+
+Thu Feb  3 09:57:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Atomic_Op.inl:
+          Added support for the GCC Atomic Builtins, if you want to
+          use these, add ACE_HAS_GCC_ATOMIC_BUILTINS defined as 1 in
+          your config file
+
+        * ace/Reactor.cpp:
+        * ace/Select_Reactor_Base.cpp:
+          Layout changes
+
+        * ace/Reactor.h:
+          Doxygen change
+
+Tue Feb  2 19:57:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * bin/PerlACE/TestTarget_WinCE.pm:
+        * bin/PerlACE/Process_Unix.pm:
+        * bin/PerlACE/ProcessLVRT.pm:
+        * bin/PerlACE/TestTarget.pm:
+        * bin/PerlACE/TestTarget_VxWorks.pm:
+        * bin/PerlACE/ProcessVX.pm:
+        * bin/PerlACE/TestTarget_LVRT.pm:
+        * bin/PerlACE/Process_Win32.pm:
+        * bin/PerlACE/Process_VMS.pm:
+
+          Added killall methods to the Process and Target frameworks.
+          Currently only full implementation on Win32 and *nix platforms
+          (empty on others).
+
+Tue Feb  2 19:52:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * html/Stats/index.shtml:
+          Updated link to Cell results
+
+Mon Feb  1 23:16:24  2010  Steve Huston  <shuston@riverace.com>
+
+        * ace/Acceptor.h: Fixed up doxygen for ACE_Oneshot_Acceptor.
+
+Tue Jan 26 03:56:45 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Init_ACE.h: Updated the documentation of ACE::init() and
+          ACE::fini() so it reflects what ACE actually does.  Thanks to
+          Steve Huston, Andrew Kaplan <alexande dot kaplan at tafcorp dot
+          com>, and Alexander Mintz <alexande dot mintz at tafcorp dot
+          com> for motivating this update.
+
+Mon Feb  1 17:35:08 UTC 2010  Chris Cleeland  <cleeland_c@local>
+
+        * ace/Obstack_T.h:
+        * ace/Obstack_T.inl:
+        * ace/Obstack_T.cpp:
+        * ace/SStringfwd.h:
+        * ace/String_Base.h:
+        * ace/String_Base.inl:
+        * ace/String_Base.cpp:
+        * ace/Tokenizer_T.h:
+        * ace/Tokenizer_T.cpp:
+
+          Integrated changes originally done in OCITAO 1.4a by Steve Totten
+          to fulfill [RT 13868].
+
+          Wed Feb  1 10:40:35 2006  Steve Totten  <totten_s@ociweb.com>
+
+          Changed the use of "CHAR" as a template parameter to "ACE_CHAR_T" to
+          avoid possible clash with "CHAR" used as a preprocessor macro.
+          Thanks to Jennifer Kahng <jennifer dot kahng at lmco dot com> for
+          reporting the problem.  This change resolves [RT 8287].
+
+Mon Feb  1 11:21:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Connector.cpp:
+          Const change
+
+        * bin/diff-builds-and-group-fixed-tests-only.sh:
+        * etc/index.html:
+        * docs/Download.html:
+          Updated because of recent release
+
+        * tests/NonBlocking_Conn_Test.cpp:
+          Improved this test so that it really tests the connections
+
+        * tests/tests.mpc:
+          Bug_3709_Regression itselfs checks now for vc71
+
+        * ace/Reactor.h:
+          Doxygen fixes
+
+Sun Jan 31 01:04:43 CST 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE version 5.7.6 released.
+
+Fri Jan 29 14:24:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/bczar/bczar.html:
+          Extended release steps
+
+Thu Jan 28 16:26:28 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
+
+        * include/makeinclude/platform_macosx_iphone.GNU:
+
+          When building for the Simulator, there is no need to
+          set things as a cross-build and set HOST_ROOT environment
+          variable.
+
+Thu Jan 28 15:11:18 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
+
+        * ACE-INSTALL.html:
+
+          Updated with information on how to build ACE for
+          iPhone/iPod Touch/iPad Simulator and Hardware.
+
+Thu Jan 28 12:49:45 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
+
+        * NEWS:
+
+          ACE/TAO now supports the new iPad ;-).
+
+Thu Jan 28 10:21:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * include/makeinclude/platform_linux.GNU:
+          Corrected fix for cross compilation on powerpc64.
+          Now also allows for non-standard named crosscompilers (like ppu-xx)
+          and cross compilation of non-powerpc target on powerpc host.
+
+Thu Jan 28 08:21:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_linux.GNU:
+          Fix for cross compilation to powerpc64
+
+Wed Jan 27 22:36:36 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * include/makeinclude/platform_win32_msvc.GNU:
+
+          Trim trailing slashes from libpath entries.
+
+        * tests/Bug_3709_Regression_Test.cpp:
+
+          This test doesn't compile on MSVC 7.1.
+
+Wed Jan 27 05:33:56 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
+
+        * ace/config-macosx-iphone-hardware.h:
+
+          undefined ACE_HAS_SYSV_IPC, it doesn't seem that the
+          iphone-hardware platform supports it.
+
+Tue Jan 26 22:55:18 UTC 2010  Adam Mitz  <mitza@ociweb.com>
+
+        * bin/MakeProjectCreator/config/ace_mc.mpb:
+
+          Assign to LDLIBS along with ACE_SHLIBS.  ACE_SHLIBS is only used
+          when building a shared library, LDLIBS is used for an executable.
+
+Tue Jan 26 19:53:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Process_Test.cpp:
+          Log some more details to get an insight why this test fails on
+          some systems
+
+Tue Jan 26 18:04:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/generate_rel_manpages:
+          Doxygen is upgraded to 1.6.2
+
+Tue Jan 26 17:02:51 UTC 2010  Steve Huston  <shuston@riverace.com>
+
+        * ace/Dev_Poll_Reactor.cpp (unbind_all): When shutting down, call
+          handle_close() on all registered handlers. Fixes Bugzilla 2750.
+
+Tue Jan 26 13:27:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_linux_common.GNU:
+          tao_idl3_to_idl2 is located in HOST_ROOT/TAO/CIAO/bin with
+          cross compilation
+
+Tue Jan 26 12:52:57 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
+
+        * ace/config-macosx-leopard.h:
+
+          Added ACE_HAS_NET_IF_DL_H macro.
+
+        * ace/os_include/net/os_if.h:
+
+          Removed hardcoding of ACE_HAS_IPHONE and ACE_HAS_MAC_OSX
+          checks. If the platform defines ACE_HAS_NET_IF_DL_H macro,
+          then <net/if_dl.h> will be included.
+
+Tue Jan 26 04:35:17 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
+
+        * ace/config-macosx-leopard.h:
+
+          Added ACE_HAS_MAC_OSX macro.
+
+        * ace/OS_NS_netdb.cpp:
+        * ace/os_include/net/os_if.h:
+
+          Enabled ACE_OS::getmacaddress() for Mac OSX as well.
+          It uses exactly the same code as the iPhone's addition below.
+
+Tue Jan 26 04:18:54 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
+
+        * ace/OS_NS_netdb.cpp:
+
+          Implement ACE_OS::getmacaddress() for iPhone. The same implementation
+          will probably work on Mac OS X as well. I will verify this in the
+          future.
+
+        * ace/os_include/net/os_if.h:
+
+          Added "#include <net/if_dl.h>" to this file if ACE_HAS_IPHONE
+          is defined. The ACE_OS::getmacaddress() depends on this include
+          include file.
+
+Mon Jan 25 18:58:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/MEM_IO.cpp
+          Added casts to fix CB2010 warnings
+
+Mon Jan 25 18:49:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/SPIPE_Stream.inl:
+          Added casts to fix CB2010 warnings
+
+Mon Jan 25 14:51:09 UTC 2010  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+
+          Modified to best handle dependencies with a space or $(...) in
+          them.   A GNU make substitute function call is used to escape
+          spaces.
+
+Mon Jan 25 09:24:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_macosx_iphone.GNU:
+          iPhone lacks rwho
+
+Sat Jan 23 18:48:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2434_Regression_Test.cpp:
+        * tests/Time_Value_Test.cpp:
+          Moved another failing test to the bug_2434 file
+
+Sat Jan 23 13:53:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Thread_Attrs_Test.cpp:
+
+          Changed test to check only if resulting stack size is
+          *at least* as large as requested.
+          As the Posix docs say that the size set for the threads stack
+          will be the *minimum* size allocated (the actual size may f.i. be
+          bigger because of a) pagesize rounding, b) guardsize addition)
+          this is the best we can do without konowing the exact algorithm
+          used by the pthread implementation.
+          Also see this https://bugzilla.redhat.com/show_bug.cgi?id=435337
+          for more information.
+
+Fri Jan 22 10:38:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * config-linux-common.h:
+
+          Added fix for mismatch of ACE_SIZEOF_LONG_DOUBLE on Linux ppc
+          32bit platforms (sizeof(long double) = 128 bit).
+
+Fri Jan 22 08:48:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Time_Value_Test.cpp:
+          Removed not used variable
+
+Thu Jan 21 23:16:27 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
+
+        * ace/CDR_Stream.cpp:
+
+          Fixed the read_8 and write_8 methods for the iPhone Hardware.
+          The iPhone Hardware (ARM architecture) has the same memory
+          layout as Intel targets, and no conversion or swapping is
+          necessary. Double values sent from Windows to iPhone Hardware
+          were messed up before this fix due to unnecessary conversion.
+
+        * ace/config-macosx-iphone-hardware.h:
+        * ace/config-macosx-iphone-simulator.h:
+
+          Added ACE_HAS_IPHONE macro.
+
+Thu Jan 21 16:33:37 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
+
+        * include/makeinclude/platform_macosx_iphone.GNU:
+
+          Removed the hardcoding of -DACE_AS_STATIC_LIBS and
+          -DTAO_AS_STATIC_LIBS to CFLAGS and CXXFLAGS and instead
+          added static_libs_only=1. That fixes the problem. Thanks
+          to Johnny Willemsen for the tip.
+
+Thu Jan 21 15:25:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Multicast_Test.cpp:
+          Fixed a Linux specific problem where certain Linux flavors use
+          VERY strict rules concerning multicast communications and where
+          using the (system defined) defaults for the network interface
+          used for multicast sending/receiving does not provide a
+          matching setup (i.e. resulting if used for sending does not
+          match the if used for receiving -> nothing received).
+          The fix simply forces a fixed 'lo' interface to be used for
+          sending and receiving.
+
+Thu Jan 21 14:57:57 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
+
+        * include/makeinclude/platform_macosx_iphone.GNU:
+
+          Added -DACE_AS_STATIC_LIBS and -DTAO_AS_STATIC_LIBS to the CFLAGS
+          and CXXFLAGS variables to allow more tests to pass on the iPhone
+          Simulator. This hardcoding is obviously the wrong thing to do,
+          and needs to be fixed in the future. For some reason, when building
+          a static executable those macros are missing.
+
+Thu Jan 21 08:13:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Time_Value_Test.cpp:
+        * tests/tests.mpc:
+        * tests/run_test.lst:
+        * tests/Bug_2434_Regression_Test.cpp:
+          Moved the 64bit overflow test which fails on 64bit systems to
+          its own file and marked that as not fixed
+
+        * tests/Multicast_Test.cpp:
+          Const changes
+
+Tue Jan 19 13:24:02 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * tests/Bug_2980_Regression_Test.cpp:
+          Added missing #include <string.h>.
+
+Mon Jan 18 17:57:47 UTC 2010  James H. Hill  <hillj at cs dot iupui dot edu>
+
+        * ace/UUID.h:
+
+          Included Auto_Ptr.h since it is not included by other included
+          header files and in breaking builds if UUID.h is included before
+          including another file that does include Auto_Ptr.h
+
+Mon Jan 18 13:47:53 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/ace_for_tao.mpc: Added Message_Queue_NT.cpp in this file since
+          it seems to be needed for the ACE_FOR_TAO subset.
+
+Fri Jan 15 10:27:30 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * ace/config-lynxos.h:
+          Define __NO_INCLUDE_WARN__ before including param.h.
+          Fixes compile warnings.
+
+Fri Jan 15 10:22:06 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * ace/Registry.cpp:
+          Fixed g++ 4.x compile warning on MinGW.
+
+Fri Jan 15 10:19:48 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * ace/config-win32-common.h:
+          Simplified setting of ACE_HAS_NONSTATIC_OBJECT_MANAGER.
+
+Fri Jan 15 04:19:45 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Message_Queue_T.cpp: Readded
+
+          #if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+          #include "ace/Message_Queue_NT.h"
+          #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
+
+          to fix a compile error on MinGW.  Thanks to Olli Savia
+          <ops@iki.fi> for this fix.
+
+Fri Jan 15 04:18:17 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Message_Queue_NT.cpp: Added
+
+          #include "ace/Message_Queue.h"
+
+          to fix a compile error on MinGW.  Thanks to Olli Savia
+          <ops@iki.fi> for this fix.
+
+Fri Jan 15 04:17:06 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Message_Queue.h: Once again removed
+
+          #if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+          #include "ace/Message_Queue_NT.h"
+          #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
+
+          from this file..
+
+Fri Jan 15 04:14:49 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/config-win32-common.h: Changed the definition
+
+          # define ACE_HAS_NONSTATIC_OBJECT_MANAGER
+
+          to
+
+          # define ACE_HAS_NONSTATIC_OBJECT_MANAGER 0
+
+          to fix a compile error on MinGW.  Thanks to Olli Savia
+          <ops@iki.fi> for this fix.
+
+Fri Jan 15 01:01:02 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
+
+        * tests/Thread_Attrs_Test.cpp:
+
+          Slight modification to allow this test to pass on the iPhone
+          builds. Changed the spanwed thread's size from 42k to 40k.
+
+          According to Apple's Documentation: "The minimum allowed stack
+          size for secondary threads is 16 KB and the stack size must be
+          a multiple of 4 KB." My change make the stack size a multiple
+          of 4k. Below is a reference to the Apple documentation for the
+          iPhone where I got the quote.
+
+          http://developer.apple.com/iphone/library/documentation/Cocoa/Conceptual/Multithreading/CreatingThreads/CreatingThreads.html
+
+Thu Jan 14 20:06:49 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
+
+        * include/makeinclude/platform_macosx_iphone.GNU:
+
+          Added "CROSS-COMPILE=1" to the top of the file.
+
+Thu Jan 14 20:02:41 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/OS_NS_Thread.cpp (add_to_argv): Replaced a call to strcpy()
+          with memmove() to avoid problems due to overlap with the
+          parameters.  Thanks to Guillaume Lahaye <Guillaume dot Lahaye at
+          nuance dot com> for reporting this.
+
+Thu Jan 14 13:04:19 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/OS_Test.cpp:
+          Unicode fix
+
+Wed Jan 13 21:20:42 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * ace/README:
+          Removed ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS and
+          ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS. These are no longer used.
+
+Wed Jan 13 21:18:42 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * tests/Reference_Counted_Event_Handler_Test.cpp:
+          Fixed typo.
+
+Wed Jan 13 14:40:35 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Message_Queue.h: Moved
+
+          #if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+          #include "ace/Message_Queue_NT.h"
+          #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
+
+          back to this file based on comments from Arto.
+
+Wed Jan 13 13:51:54 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Message_Queue_T.cpp: Moved
+
+          #if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+          #include "ace/Message_Queue_NT.h"
+          #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
+
+          to outside the versioned namespace block.  Thanks to Johnny for
+          reporting this.
+
+Wed Jan 13 09:03:19 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/fuzz.pl:
+          Only check run*.pl files when the filenames starts with run
+
+Wed Jan 13 06:45:19 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/sys/os_types.h:
+        * ace/OS_NS_arpa_inet.cpp:
+        * ace/OS_NS_unistd.inl:
+          VxWorks 6.8 fixes
+
+        * ace/UUID.cpp:
+          Only one exit point for operator=, const change, initialise pointer with 0
+
+Wed Jan 13 03:24:06 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Message_Queue.h,
+        * ace/Message_Queue_T.cpp: Moved the code
+
+          #if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+          #include "ace/Message_Queue_NT.h"
+          #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
+
+          from ace/Message_Queue.h to ace/Message_Queue_T.cpp since that
+          is more localized.
+
+Wed Jan 13 02:54:10 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/XtReactor/XtReactor.cpp: Removed stray tabs.  Thanks to
+          Johnny for reporting this.
+
+Tue Jan 12 20:25:19 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/fuzz.pl:
+          Disable run_test.pl checking for some directories that
+          aren't converted yet
+
+Tue Jan 12 19:52:04 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * ace/Time_Value.inl:
+          Fixed typo.
+
+        * ace/config-openbsd.h:
+          Removed ACE_LACKS_STRFTIME.
+
+Tue Jan 12 19:41:07 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * ace/config-integritySCA.h:
+          Removed ACE_LACKS_FILE_FCNTL. It is no longer used.
+
+Tue Jan 12 19:36:32 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * ace/config-openbsd.h:
+          Removed ACE_LACKS_EXECINFO_H. It is no longer used.
+
+Tue Jan 12 19:33:25 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * ace/os_include/netinet/os_tcp.h:
+        * configure.ac:
+          Fixed typo.
+
+Tue Jan 12 19:28:32 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * ace/config-integritySCA.h:
+          Removed ACE_LACKS_USER. It is no longer used.
+
+Tue Jan 12 19:24:54 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * ace/config-netbsd.h:
+          Removed ACE_LACKS_WSCANF. It is no longer used.
+
+Tue Jan 12 19:22:23 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * ace/config-mvs.h:
+          Removed ACE_LACKS_SYS_NERR. It is no longer used.
+
+Tue Jan 12 19:19:26 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * ace/config-netbsd.h:
+          Removed ACE_LACKS_SWSCANF. It is no longer used.
+
+Tue Jan 12 19:15:19 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * ace/OS_NS_stdlib.h:
+          Fixed typo.
+
+        * ace/README:
+          Removed ACE_LACKS_SID and ACE_LACKS_STRCHR.
+          These are no longer used.
+
+        * ace/config-integritySCA.h:
+          Removed ACE_LACKS_SHARED_MEMORY. It is no longer used.
+
+Tue Jan 12 19:04:15 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * ace/config-mvs.h:
+          Removed ACE_LACKS_MSGBUF_T. It is no longer used.
+
+Tue Jan 12 18:52:21 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * ace/README:
+          Removed ACE_LACKS_CMSG_DATA_MACRO and ACE_LACKS_CMSG_DATA_MEMBER.
+          These are no longer used.
+
+Tue Jan 12 14:18:58 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * ace/CDR_Base.h:
+          Removed obsolete comment.
+
+        * ace/config-lynxos.h:
+          Minor cleanup.
+
+Mon Jan 11 13:53:54 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/XtReactor/XtReactor.{h,cpp}: Added a fix for BugID 3775.
+          Thanks to Dirk Bonekaemper <dirk dot bonekaemper at dfs dot de>
+          for this fix.
+
+Mon Jan 11 02:24:01 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/config-macros.h (ACE_WIN32CALL_RETURN): Changed
+
+          TYPE ace_result_ = (TYPE) X; \
+
+          to
+
+          TYPE ace_result_; \
+          ace_result_ = (TYPE) X; \
+
+          to fix a compile error on MinGW.  Thanks to Arto Jalkanen
+          <ajalkane at gmail dot com> for this fix.
+
+Mon Jan 11 02:20:09 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Message_Queue.h: Added
+
+          #if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
+          #include "ace/Message_Queue_NT.h"
+          #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
+
+          to fix a compile error on MinGW.  Thanks to Arto Jalkanen
+          <ajalkane at gmail dot com> for this fix.
+
+Tue Jan 12 04:12:41 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
+
+        * ace/config-macosx-iphone-hardware.h:
+        * ace/config-macosx-iphone-simulator.h:
+
+          Split the below file to the two files listed above.
+
+        * ace/config-macosx-iphone.h:
+
+          Removed this file.
+
+Tue Jan 12 02:10:48 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
+
+        * include/makeinclude/platform_macosx_iphone.GNU:
+
+          crt1.10.6.o is missing under MacOSX 10.6 for iPhone Simulator.
+          Fallback to 10.5 until apple provides the missing crt1.10.6.o
+
+Sat Jan  9 00:42:55 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
+
+        * ace/config-macosx-iphone.h:
+
+          added "#define ACE_SIZEOF_LONG_DOUBLE 8" since this is the size
+          of long double on my iPhone 3GS. The value of long double in the
+          simulator is probably different. We need to adjust this once
+          we verify that the simulator value is different than the
+          hardware's value.
+
+Wed Jan  6 05:25:26 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
+
+        * include/makeinclude/platform_macosx_iphone.GNU:
+
+          When building an executable for the iPhone Hardware (not simulator)
+          go ahead and automatically codesign the executable so it can be
+          deployed on the hardware. Note that this is a temporary hack until
+          I can figure the proper way to do this.
+
+Wed Jan  6 04:28:23 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
+
+        * include/makeinclude/platform_macosx_iphone.GNU:
+
+          Minor enhancement.
+
+Mon Jan  4 20:09:39 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * rpmbuild/ace-tao.spec
+          Also dump lsb_release info
+
+Fri Jan  1 03:09:45 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * Happy New Year everyone!!!
+
+Thu Dec 31 20:54:51 UTC 2009  Steve Huston  <shuston@riverace.com>
+
+        * ace/High_Res_Timer.cpp (get_cpuinfo): Don't use a CPU MHz value 0.
+          I got a customer report with a real cpuinfo file showing 0.
+
+Thu Dec 31 17:46:10 UTC 2009  Steve Huston  <shuston@riverace.com>
+
+        * bin/MakeProjectCreator/config/ace_fl.mpb: Rather than add
+          PLATFORM_GL_LDFLAGS twice, one should be PLATFORM_X11_LDFLAGS.
+          Thanks to Aaron Scamehorn for catching this.
+
+Thu Dec 31 17:24:14 UTC 2009  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/wrapper_macros.GNU: If both static_libs_only
+          and shared_libs_only are set, report the error and stop. Thanks to
+          Howard Finer for reporting this.
+
+Thu Dec 31 12:27:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/fuzz.pl:
+          Fixed fuzz check for Spawn with Stop
+
+Wed Dec 30 08:41:03 UTC 2009  Olli Savia  <ops@iki.fi>
+
+        * ace/Sig_Handler.cpp:
+          Do not use SA_SIGINFO on LynxOS.
+
+Thu Dec 24 10:55:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * performance-tests/RPC/run_test.pl
+        * performance-tests/SCTP/run_spectrum.pl
+        * performance-tests/TCP/run_test.pl
+        * performance-tests/UDP/run_test.pl
+          Fuzz fixes
+
+Thu Dec 24 10:49:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * protocols/tests/HTBP/ping/run_test.pl
+        * protocols/tests/HTBP/Reactor_Tests/run_test.pl
+        * protocols/tests/HTBP/Send_Large_Msg/run_test.pl
+        * protocols/tests/HTBP/Send_Recv_Tests/run_test.pl
+        * tests/run_test.pl
+          Fixed fuzz
+
+Thu Dec 24 10:20:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * apps/gperf/src/Bool_Array.h:
+        * apps/gperf/src/Key_List.h:
+          Fixes for C++ Builder 2010 Update 4/5
+
+Thu Dec 24 09:54:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_string.cpp:
+          Const changes, layout changes, call ACE_OS::strncat instead of
+          strncat directly
+
+        * ace/Log_Msg.cpp:
+        * ace/Log_Msg.h:
+          Const changes
+
+        * ace/config-win32-borland.h:
+          C++ Builder 2010 has a broken wcsncat, reported as QC80630, for
+          this version we now enable the ACE emulation for wcsncat
+
+        * ace/OS_NS_wchar.cpp:
+          Initialise some pointers with 0
+
+Mon Dec 21 11:29:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/fuzz.pl:
+          Fixed error message and added a test for generated file headers
+
+Mon Dec 21 11:26:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/bootstrap:
+          Invoke autoupdate as part of this script
+
+Sun Dec 20 07:58:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/checked_iterator.h:
+          stl port doesn't have a checked iterator. This fixes bugzilla
+          3799 and 3420. Thanks to <sailzeng at tencent dot com> and
+          Mark Hebbel <Mark dot Hebbel at baslerweb dot com> for
+          reporting this
+
+Fri Dec 18 17:40:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/PerlACE/ProcessVX_Unix.pm:
+        * bin/PerlACE/ProcessVX_Win32.pm:
+          Added IgnoreHostRoot
+
+Fri Dec 18 12:55:00 UTC 2009  Martin Corino  <mcorino@remedy.nl>
+
+        * NEWS:
+          Updated fixed bugzilla entries.
+
+Thu Dec 17 12:29:00 UTC 2009  Martin Corino  <mcorino@remedy.nl>
+
+        * ace/INET_Addr.inl:
+          Fixed bug in ::is_multicast() for little-endian platforms.
+          This fixes Bugzilla #3729.
+
+        * tests/Bug_3729_Regression_Test.cpp:
+          Fixed typo in logfile name.
+
+        * tests/run_test.lst:
+          Removed !FIXED_BUGS_ONLY for Bug_3729_Regression_Test.
+
+Wed Dec 16 11:24:00 UTC 2009  Martin Corino  <mcorino@remedy.nl>
+
+        * ACE_wrappers/ace/Log_Msg.h:
+          Updated doxygen docu regarding additions to %D and %T
+          options.
+
+Wed Dec 16 09:09:00 UTC 2009  Martin Corino  <mcorino@remedy.nl>
+
+        * ACE_wrappers/ace/ACE.h:
+        * ACE_wrappers/ace/ACE.cpp:
+        * ACE_wrappers/ace/Log_Msg.cpp:
+          Added option to print a given ACE_Time_Value in the log
+          message instead of system supplied timestamp as in %T
+          and %D.
+          The option is implemented as a variant of the %D/%T
+          options by using the '#' flag character like '%#D' or
+          '%#T'. When using this flag an ACE_Time_Value pointer is
+          expected in the argument list supplied with the log message.
+          This fixed Bugzilla #3221.
+
+        * ACE_wrappers/tests/Log_Msg_Test.cpp:
+          Added some testlines for this option.
+
+Mon Dec 14 14:58:05 UTC 2009  Abdul Sowayan  <sowayan@gmail.com>
+
+        * NEWS:
+
+          Updated to note iPhone/iPod Touch support.
+
+Mon Dec 14 11:21:46 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * html/Stats/index.shtml:
+          Updated link to PS3/IBM Cell performance graphs
+
+Mon Dec 14 10:58:46 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Export/run_test.pl:
+          Fixed fuzz error
+
+Sun Dec 13 22:38:13 UTC 2009  Abdul Sowayan  <sowayan@gmail.com>
+
+        * include/makeinclude/platform_macosx_iphone.GNU:
+
+          Changed to allow iPhone Hardware compiler to generate executables.
+
+Sun Dec 13 18:30:26 UTC 2009  Abdul Sowayan  <sowayan@gmail.com>
+
+        * include/makeinclude/platform_macosx_iphone.GNU:
+
+          Enhanced iPhone support. Now we can build for the iPhone
+          Hardware target in addition to the simulator.
+
+Sat Dec 12 15:40:13 UTC 2009  Abdul Sowayan  <sowayan@gmail.com>
+
+        * ace/config-macosx-iphone.h:
+        * include/makeinclude/platform_macosx_iphone.GNU:
+
+          First cut at supporting iPhone 3.1.2. These files need
+          some cleanup. With these files, using the iPhone simulator
+          I was able to spawn ACE Threads, print ACE Logs messages,
+          and communicate between the the iPhone simulator and a
+          Windows machine using CORBA.
+
+Thu Dec 10 20:03:58 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/fuzz.pl:
+          Improved error message
+
+Thu Dec 10 15:37:58 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/ACETAOCIAO.style:
+          Small updates
+
+Thu Dec 10 15:10:58 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/fuzz.pl:
+          Check all run_*.pl files for fuzz
+
+Thu Dec 10 13:07:58 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-win32-borland.h:
+          Removed hard supported version check
+
+Wed Dec  9 10:52:26 UTC 2009  Denis Budko  <denis.budko@remedy.nl>
+
+        * bin/fuzz.pl:
+
+          Updated conditions for new framework
+
+Mon Dec  7 16:09:18 UTC 2009  Steve Huston  <shuston@riverace.com>
+
+        * tests/Basic_Types_Test.cpp: Add a verification for the endianness
+          setting.
+
+Mon Dec  7 07:40:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/bmake.features:
+          Disable mcpp for bmake
+
+Fri Dec  4 23:24:21 UTC 2009  Yan Dai  <dai_y@ociweb.com>
+
+        * bin/MakeProjectCreator/config/global.features:
+
+          Added mpc feature to optionally turn on the indirection
+          support on valuetype outgoing message. It defaults to
+          be enabled. To be compatible with previous version TAO,
+          it needs run mwc.pl with
+          "-features valuetype_out_indirection=0" to disable it.
+
+Fri Dec  4 17:25:32 UTC 2009  Yan Dai  <dai_y@ociweb.com>
+
+        * NEWS:
+
+          Removed entry for member validation feature in LoadBalancer as it
+          should be in TAO NEWS.
+
+Fri Dec  4 13:19:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * html/Stats/index.shtml:
+          Added link for IBM Cell xampler performance stats
+
+Fri Dec  4 10:20:23 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * bin/fuzz.pl:
+          Removed -v option. The information which is generated
+          by -v should always be visible.
+
+Fri Dec  4 07:30:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-win32-borland.h:
+          CB2010 fix
+
+Thu Dec  3 11:59:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/fuzz.pl:
+          Check CIAO_TRACE macros and put all run_*.pl files in a separate
+          list
+
+Wed Dec  2 18:17:04 UTC 2009  Yan Dai  <dai_y@ociweb.com>
+
+        * NEWS:
+
+          Added entry for member validation feature in LoadBalancer.
+
+Wed Dec  2 13:46:00 UTC 2009  Martin Corino  <mcorino@remedy.nl>
+
+        * debianbuild/{all files containign version numbers}:
+          Updated to latest micro release.
+
+Wed Dec  2 13:30:00 UTC 2009  Martin Corino  <mcorino@remedy.nl>
+
+        * bin/make_release.py:
+          Added code to update version numbers in ACE_ROOT/debianbuild files
+          on release.
+          Changed to retrieve repo root by default from info of working copy.
+
+Wed Dec  2 07:51:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/copy-script.sh:
+          Also copy md5 files
+
+        * bin/MakeProjectCreator/config/bmake.features:
+          Enable mcpp for bmake
+
+Thu Nov 26 02:08:59 UTC 2009  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * Gaurav Kulshreshtha is the 2300th contributor to ACE+TAO+CIAO!
+
+Mon Nov 30 19:11:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * apps/gperf/src/Bool_Array.h:
+        * apps/gperf/src/Key_List.h:
+          C++ Builder 2010 fixes
+
+Mon Nov 30 14:02:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Process.cpp:
+        * ace/Process.h:
+          Fixed gcc warnings
+
+Mon Nov 30 12:38:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-win32-borland.h:
+          Started port to C++ Builder 2010, older versions of C++ Builder are
+          now deprecated
+
+        * ace/MMAP_Memory_Pool.cpp:
+          Layout change
+
+        * ace/OS_NS_sys_time.h:
+        * ace/OS_NS_sys_time.inl:
+          Removed workarounds for ancient wince versions
+
+        * ace/Process.cpp:
+        * ace/Process.h:
+          Use bool and size_t and removed some ugly casts
+
+        * ace/Trace.cpp:
+        * ace/Trace.h:
+          Use bool
+
+Mon Nov 30 10:53:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * debianbuild/patches/18-fix-bswap-detection.dpatch:
+        * debianbuild/patches/22-tao_idl-64bit-fix.dpatch:
+          Removed, not needed anymore
+
+Mon Nov 30 10:08:00 UTC 2009  Martin Corino <mcorino@remedy.nl>
+
+        * include/makeinclude/platform_linux_common.GNU:
+
+          Added some rules to support cross builds.
+          Setting the environment variable (or make variable) CROSS_COMPILE
+          to the platform tool prefix will redefine the CC, CXX and AR
+          variables and add a '-Wl,-rpath-link' option to the LDFLAGS.
+          If the HOST_ROOT variable has been set as well TAO_IDLxxx variables
+          will be redefined as well.
+
+Mon Nov 30 08:58:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/diff-builds-and-group-fixed-tests-only.sh:
+        * bin/Download.html:
+          updated for x.7.5
+
+        * bin/make_release.py
+        * rpmbuild/ace-tao-ciao.spec
+        * rpmbuild/ace-tao.spec
+          Updated to match opensuse build service
+
+        * docs/svn/svn-prefs.reg:
+          Added idl3+
+
+        * etc/index.html:
+          Added 5.7.5
+
+Sun Nov 29 13:06:02 CST 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE version 5.7.5 released.
+
+Thu Nov 26 12:33:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Message_Queue_Test.cpp:
+          Fixed msvc warning
+
+Thu Nov 26 04:19:02 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tests/Message_Queue_Test.cpp:
+
+          Attempt to resolve warning for MSVC.
+
+Tue Nov 24 09:39:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Tokenizer_T.cpp:
+          Check if buffer_ is not nil
+
+        * bin/fuzz.pl:
+          Export files shouldn't be in the ciao repository anymore, all
+          should be generated by TAO_IDL
+
+Mon Nov 23 10:56:18 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * THANKS:
+          Added Wolfgang Pickartz.for solving a TAO_IDL compiler
+          issue.
+
+Mon Nov 23 07:53:57 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * debianbuild/changelog:
+        * debianbuild/control:
+        * debianbuild/dsc:
+        * debianbuild/rules:
+          Imported last version from debian
+
+Thu Nov 19 20:29:57 UTC 2009  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Log_Msg_NT_Event_Log.cpp (ACE_Log_Msg_NT_Event_Log::log):
+          Added checks to ensure that log() works properly if the msg_data
+          size is greater than ACE_Log_Record::MAXLOGMSGLEN.  Thanks to
+          Gaurav Kulshreshtha <gaurav dot kulshreshtha at onmobile dot
+          com> for contributing this fix.
+
+Fri Nov 20 08:45:52 UTC 2009  Olli Savia  <ops@iki.fi>
+
+        * ace/Log_Msg.cpp:
+          Updated documentation for '%S' modifier.
+
+Fri Nov 20 07:06:04 UTC 2009  Olli Savia  <ops@iki.fi>
+
+        * ace/Sig_Handler.cpp:
+          Reverted: Sun Nov  1 16:47:29 UTC 2009  Olli Savia  <ops@iki.fi>
+
+Thu Nov 19 14:08:29 UTC 2009  Olli Savia  <ops@iki.fi>
+
+        * ace/Sig_Handler.cpp:
+          Reverted: Mon Nov  2 08:36:24 UTC 2009  Olli Savia  <ops@iki.fi>
+
+Wed Nov 19 09:45:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-WinCE.h:
+          Only define FILE_MAP_COPY when it is not defined yet
+
+Mon Nov 16 14:40:42 UTC 2009  Olli Savia  <ops@iki.fi>
+
+        * include/makeinclude/platform_win32_interix.GNU:
+        * ace/config-win32-interix.h:
+        * ace/os_include/sys/os_types.h:
+          Updated Interix support.
+
+Sun Nov 15 08:09:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * debianbuild/*:
+          Renamed all files for x.7.4
+
 Fri Nov 13 19:38:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * bin/fuzz.pl:
diff --git a/ChangeLogs/ChangeLog-93 b/ChangeLogs/ChangeLog-1993
index 0beb8e6321f..0beb8e6321f 100644
--- a/ChangeLogs/ChangeLog-93
+++ b/ChangeLogs/ChangeLog-1993
diff --git a/ChangeLogs/ChangeLog-94 b/ChangeLogs/ChangeLog-1994
index 09465ce823f..09465ce823f 100644
--- a/ChangeLogs/ChangeLog-94
+++ b/ChangeLogs/ChangeLog-1994
diff --git a/ChangeLogs/ChangeLog-95 b/ChangeLogs/ChangeLog-1995
index 429e5681fdc..429e5681fdc 100644
--- a/ChangeLogs/ChangeLog-95
+++ b/ChangeLogs/ChangeLog-1995
diff --git a/ChangeLogs/ChangeLog-96a b/ChangeLogs/ChangeLog-1996a
index 5aa3c9b69fc..5aa3c9b69fc 100644
--- a/ChangeLogs/ChangeLog-96a
+++ b/ChangeLogs/ChangeLog-1996a
diff --git a/ChangeLogs/ChangeLog-96b b/ChangeLogs/ChangeLog-1996b
index 5dd7b809a42..5dd7b809a42 100644
--- a/ChangeLogs/ChangeLog-96b
+++ b/ChangeLogs/ChangeLog-1996b
diff --git a/ChangeLogs/ChangeLog-97a b/ChangeLogs/ChangeLog-1997a
index 161d4746d2d..161d4746d2d 100644
--- a/ChangeLogs/ChangeLog-97a
+++ b/ChangeLogs/ChangeLog-1997a
diff --git a/ChangeLogs/ChangeLog-97b b/ChangeLogs/ChangeLog-1997b
index da7e8bf2f84..da7e8bf2f84 100644
--- a/ChangeLogs/ChangeLog-97b
+++ b/ChangeLogs/ChangeLog-1997b
diff --git a/ChangeLogs/ChangeLog-98a b/ChangeLogs/ChangeLog-1998a
index c5daa4d7ee1..c5daa4d7ee1 100644
--- a/ChangeLogs/ChangeLog-98a
+++ b/ChangeLogs/ChangeLog-1998a
diff --git a/ChangeLogs/ChangeLog-98b b/ChangeLogs/ChangeLog-1998b
index d9de5949d12..d9de5949d12 100644
--- a/ChangeLogs/ChangeLog-98b
+++ b/ChangeLogs/ChangeLog-1998b
diff --git a/ChangeLogs/ChangeLog-99a b/ChangeLogs/ChangeLog-1999a
index 5399b215825..5399b215825 100644
--- a/ChangeLogs/ChangeLog-99a
+++ b/ChangeLogs/ChangeLog-1999a
diff --git a/ChangeLogs/ChangeLog-99b b/ChangeLogs/ChangeLog-1999b
index 2bdeb97ccd3..2bdeb97ccd3 100644
--- a/ChangeLogs/ChangeLog-99b
+++ b/ChangeLogs/ChangeLog-1999b
diff --git a/ChangeLogs/ChangeLog-00a b/ChangeLogs/ChangeLog-2000a
index 29d983c12cd..29d983c12cd 100644
--- a/ChangeLogs/ChangeLog-00a
+++ b/ChangeLogs/ChangeLog-2000a
diff --git a/ChangeLogs/ChangeLog-00b b/ChangeLogs/ChangeLog-2000b
index 333c85f7a1e..333c85f7a1e 100644
--- a/ChangeLogs/ChangeLog-00b
+++ b/ChangeLogs/ChangeLog-2000b
diff --git a/ChangeLogs/ChangeLog-01a b/ChangeLogs/ChangeLog-2001a
index 2c80dd6896a..2c80dd6896a 100644
--- a/ChangeLogs/ChangeLog-01a
+++ b/ChangeLogs/ChangeLog-2001a
diff --git a/ChangeLogs/ChangeLog-01b b/ChangeLogs/ChangeLog-2001b
index 504c875d72b..504c875d72b 100644
--- a/ChangeLogs/ChangeLog-01b
+++ b/ChangeLogs/ChangeLog-2001b
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-2002a
index 870ec350d6e..870ec350d6e 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-2002a
diff --git a/ChangeLogs/ChangeLog-02b b/ChangeLogs/ChangeLog-2002b
index c13db37e19f..c13db37e19f 100644
--- a/ChangeLogs/ChangeLog-02b
+++ b/ChangeLogs/ChangeLog-2002b
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-2003a
index 930128362db..930128362db 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-2003a
diff --git a/ChangeLogs/ChangeLog-03b b/ChangeLogs/ChangeLog-2003b
index 311de7bdba4..311de7bdba4 100644
--- a/ChangeLogs/ChangeLog-03b
+++ b/ChangeLogs/ChangeLog-2003b
diff --git a/ChangeLogs/ChangeLog-03c b/ChangeLogs/ChangeLog-2003c
index bbd6f2714d6..bbd6f2714d6 100644
--- a/ChangeLogs/ChangeLog-03c
+++ b/ChangeLogs/ChangeLog-2003c
diff --git a/ChangeLogs/ChangeLog-04a b/ChangeLogs/ChangeLog-2004a
index 0c4668dfbb2..0c4668dfbb2 100644
--- a/ChangeLogs/ChangeLog-04a
+++ b/ChangeLogs/ChangeLog-2004a
diff --git a/ChangeLogs/ChangeLog-04b b/ChangeLogs/ChangeLog-2004b
index fe54044d243..fe54044d243 100644
--- a/ChangeLogs/ChangeLog-04b
+++ b/ChangeLogs/ChangeLog-2004b
diff --git a/ChangeLogs/ChangeLog-05a b/ChangeLogs/ChangeLog-2005a
index c6a64f51119..c6a64f51119 100644
--- a/ChangeLogs/ChangeLog-05a
+++ b/ChangeLogs/ChangeLog-2005a
diff --git a/ChangeLogs/ChangeLog-05b b/ChangeLogs/ChangeLog-2005b
index 15f3ed61bea..15f3ed61bea 100644
--- a/ChangeLogs/ChangeLog-05b
+++ b/ChangeLogs/ChangeLog-2005b
diff --git a/ChangeLogs/ChangeLog-05c b/ChangeLogs/ChangeLog-2005c
index 3dfeb0ad918..3dfeb0ad918 100644
--- a/ChangeLogs/ChangeLog-05c
+++ b/ChangeLogs/ChangeLog-2005c
diff --git a/ChangeLogs/ChangeLog-06a b/ChangeLogs/ChangeLog-2006a
index f5ab9e868ab..f5ab9e868ab 100644
--- a/ChangeLogs/ChangeLog-06a
+++ b/ChangeLogs/ChangeLog-2006a
diff --git a/ChangeLogs/ChangeLog-06b b/ChangeLogs/ChangeLog-2006b
index 2212ce3f6f0..2212ce3f6f0 100644
--- a/ChangeLogs/ChangeLog-06b
+++ b/ChangeLogs/ChangeLog-2006b
diff --git a/ChangeLogs/ChangeLog-07a b/ChangeLogs/ChangeLog-2007a
index b70a051d787..b70a051d787 100644
--- a/ChangeLogs/ChangeLog-07a
+++ b/ChangeLogs/ChangeLog-2007a
diff --git a/ChangeLogs/ChangeLog-07b b/ChangeLogs/ChangeLog-2007b
index 2e96e779dc8..2e96e779dc8 100644
--- a/ChangeLogs/ChangeLog-07b
+++ b/ChangeLogs/ChangeLog-2007b
diff --git a/ChangeLogs/ChangeLog-08a b/ChangeLogs/ChangeLog-2008a
index 7a48c1babf4..7a48c1babf4 100644
--- a/ChangeLogs/ChangeLog-08a
+++ b/ChangeLogs/ChangeLog-2008a
diff --git a/ChangeLogs/ChangeLog-09a b/ChangeLogs/ChangeLog-2009a
index f02039d5f51..f02039d5f51 100644
--- a/ChangeLogs/ChangeLog-09a
+++ b/ChangeLogs/ChangeLog-2009a
diff --git a/ChangeLogs/ChangeLog-09b b/ChangeLogs/ChangeLog-2009b
index 5e3344157c2..5e3344157c2 100644
--- a/ChangeLogs/ChangeLog-09b
+++ b/ChangeLogs/ChangeLog-2009b
diff --git a/NEWS b/NEWS
index f9507015e62..a71595f72e8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,16 +1,29 @@
+USER VISIBLE CHANGES BETWEEN ACE-5.7.6 and ACE-5.7.7
+====================================================
+
+. Added support for GCC builtin Atomic instructions which
+  are enabled with GCC >= 4.1 for PPC32/PPC64/IA64
+
+. Improved autoconf support for debian
+
+. Added support for -mcpu and -mtune. Add TCPU=.. to your
+  environment/platform_macros.GNU to specify you cpu and
+  than add cpumodelflag=1 and/or tunemodelflag=1. Using
+  this with IBM Cell increased the performance significantly
+
 USER VISIBLE CHANGES BETWEEN ACE-5.7.5 and ACE-5.7.6
 ====================================================
 
-. Added support for iPhone OS 3.1.2. The following
-  environment variable are needed:
+. Added support for iPhone/iPod Touch/iPad. The following
+  environment variables are needed:
 
   IPHONE_TARGET, should be set to either SIMULATOR or
   HARDWARE. Set to HARDWARE if you want to deploy
-  on the iPhone/iPod Touch device.
+  on the iPhone/iPod Touch/iPad device.
 
-  IPHONE_VERSION, should be set to 3.1.2. One can set
-  the version to any future or past versions, but
-  only 3.1.2 has been tried.
+  IPHONE_VERSION, should be set to 3.1.2 or 3.2. One can
+  set the version to any future or past versions, but
+  only 3.1.2 and 3.2 have been tried.
 
   Note that one has to compile ACE/TAO statically as
   it is believed that the iPhone OS does not support
@@ -20,17 +33,20 @@ USER VISIBLE CHANGES BETWEEN ACE-5.7.5 and ACE-5.7.6
 
 . Added support for Embarcadero C++ Builder 2010
 
-. Added option to print a given ACE_Time_Value in the log 
+. Added option to print a given ACE_Time_Value in the log
   message instead of system supplied timestamp as in %T
   and %D.
-  The option is implemented as a variant of the %D/%T 
-  options by using the '#' flag character like '%#D' or 
-  '%#T'. When using this flag an ACE_Time_Value pointer is 
+  The option is implemented as a variant of the %D/%T
+  options by using the '#' flag character like '%#D' or
+  '%#T'. When using this flag an ACE_Time_Value pointer is
   expected in the argument list supplied with the log message.
   This fixed Bugzilla #3221.
-  
+
 . Fixed problems with ACE_INET_Addr::is_multicast() on
-  little endian platforms. This fixed bugzilla #3729.  
+  little endian platforms. This fixed bugzilla #3729.
+
+. Added compilation support for VxWorks 6.8, no runtime
+  testing has been performed
 
 USER VISIBLE CHANGES BETWEEN ACE-5.7.4 and ACE-5.7.5
 ====================================================
diff --git a/PROBLEM-REPORT-FORM b/PROBLEM-REPORT-FORM
index b0b170f254b..d813b23dbb4 100644
--- a/PROBLEM-REPORT-FORM
+++ b/PROBLEM-REPORT-FORM
@@ -43,7 +43,7 @@
 To: ace-bugs@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 5.7.5
+    ACE VERSION: 5.7.6
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/THANKS b/THANKS
index e1c9f26b6f8..73c124ca67d 100644
--- a/THANKS
+++ b/THANKS
@@ -776,7 +776,6 @@ Philipp Slusallek <slusallek at graphics dot stanford dot edu>
 Matthew Davis <matthew dot davis at solers dot com>
 Janusz Stopa <jstopa at bear dot com>
 Rusty Conover <rconover at zootweb dot com>
-Alex Mintz <amintz at bear dot com>
 Phillippe Merle <Philippe dot Merle at lifl dot fr>
 Mark Winrock <mwinrock at nortelnetworks dot com>
 Boris Kaminer <boris_kaminer at mail dot ru>
@@ -2310,7 +2309,16 @@ Gaurav Kulshreshtha <gaurav dot kulshreshtha at onmobile dot com>
 Wolfgang Pickartz <Wolfgang dot Pickartz at procom.de>
 Joost Kraaijeveld <J dot Kraaijeveld at Askesis dot nl>
 Pau Garcia i Quiles <pgquiles at elpauer dot org>
-<sailzeng at tencent dot com>
+Sail Zeng <sailzeng at tencent dot com>
+Dirk Bonekaemper <dirk dot bonekaemper at dfs dot de>
+Sreejith <sreejithsmadhavan at gmail dot com>
+Guillaume Lahaye <Guillaume dot Lahaye at nuance dot com>
+Andrew Kaplan <alexande dot kaplan at tafcorp dot com>
+Alexander Mintz <alexande dot mintz at tafcorp dot com>
+Jennifer Kahng <jennifer dot kahng at lmco dot com>
+Trent Nadeau <Trent dot Nadeau at ngc dot com>
+Nick Meyer <nick dot meyer at sensis dot com>
+Olivier Langlois <olivier at olivierlanglois dot net>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/VERSION b/VERSION
index 2991a6fabef..c626a34976b 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 5.7.5, released Sun Nov 29 13:06:02 CST 2009
+This is ACE version 5.7.6, released Sun Jan 31 01:04:43 CST 2010
 
 If you have any problems with or questions about ACE, please send
 email to the ACE mailing list (ace-users@cs.wustl.edu), using the form
diff --git a/bin/ACETAOCIAO.style b/bin/ACETAOCIAO.style
index ca0619acaf3..3e20fc492d3 100644
--- a/bin/ACETAOCIAO.style
+++ b/bin/ACETAOCIAO.style
@@ -100,6 +100,12 @@
 <rule name="expressions-binary-spacing">
 <presetreference>Expressions_Binary Operators_Spaced</presetreference>
 </rule>
+<rule name="expressions-conditional-spacing">
+<presetreference>Expressions_Conditional Operators_Spaced</presetreference>
+</rule>
+<rule name="expressions-conditional-spacing" override="true">
+<presetreference>Expressions_Conditional Operators_Disabled</presetreference>
+</rule>
 <rule name="expressions-functioncall-spacing">
 <presetreference>Functions_Calls_Spaced</presetreference>
 </rule>
@@ -109,6 +115,9 @@
 <rule name="expressions-pointer-spacing">
 <presetreference>Expressions_Pointer Operators_Not Spaced</presetreference>
 </rule>
+<rule name="expressions-pointer-wrapping">
+<presetreference>Expressions_Pointer Operator Wrapping_After</presetreference>
+</rule>
 <rule name="expressions-unary-spacing">
 <presetreference>Expressions_Logical and Bitwise Unary Operators_Not Spaced</presetreference>
 </rule>
@@ -151,8 +160,11 @@
 <rule name="function-parameter-alignment">
 <presetreference>Functions_Parameter Alignment_Bracket</presetreference>
 </rule>
+<rule name="function-parameter-brackets" override="true">
+<presetreference>Functions_Parameter Brackets_Disabled</presetreference>
+</rule>
 <rule name="function-parameter-lines">
-<presetreference>Functions_Parameter Lines_False</presetreference>
+<presetreference>Functions_Parameter Lines_True</presetreference>
 </rule>
 <rule name="function-parameter-spacing">
 <presetreference>Functions_Parameter Spacing_AfterComma</presetreference>
@@ -170,7 +182,7 @@
 <presetreference>Global_Alignment ensures at least one space_False</presetreference>
 </rule>
 <rule name="global-bracing-style">
-<presetreference>Global_Default Block Brace Position_Aligned</presetreference>
+<presetreference>Global_Default Block Brace Position_Indented</presetreference>
 </rule>
 <rule name="global-bracket-alignment">
 <presetreference>Expressions_Bracket Alignment_AlignAtBracket</presetreference>
@@ -253,9 +265,6 @@
 <rule name="multiple-inheritance">
 <presetreference>Classes and Structs_Multiple Inheritance_OnePerLine</presetreference>
 </rule>
-<rule name="multiple-inheritance" override="true">
-<presetreference>Classes and Structs_Multiple Inheritance_Disabled</presetreference>
-</rule>
 <rule name="namespace-bracing-style">
 <presetreference>Namespaces_Brace Position_Aligned</presetreference>
 </rule>
diff --git a/bin/MakeProjectCreator/config/ace_mc.mpb b/bin/MakeProjectCreator/config/ace_mc.mpb
index 9b43cf23b46..fe152fbae0c 100644
--- a/bin/MakeProjectCreator/config/ace_mc.mpb
+++ b/bin/MakeProjectCreator/config/ace_mc.mpb
@@ -12,6 +12,7 @@ project : ace_etcl_parser {
   verbatim (gnuace, local) {
     "ifeq (1,$(winnt))"
     "  ACE_SHLIBS += pdh.lib"
+    "  LDLIBS += pdh.lib"
     "endif"
   }
 }
diff --git a/bin/MakeProjectCreator/config/aceexe.mpb b/bin/MakeProjectCreator/config/aceexe.mpb
index cfd59d40b8d..cd10a7f6f23 100644
--- a/bin/MakeProjectCreator/config/aceexe.mpb
+++ b/bin/MakeProjectCreator/config/aceexe.mpb
@@ -2,5 +2,4 @@
 // $Id$
 
 project: acedefaults, acenosubsets, ace_for_tao, versioned_namespace {
-
 }
diff --git a/bin/MakeProjectCreator/config/global.features b/bin/MakeProjectCreator/config/global.features
index f25df8b9d79..2819469849a 100644
--- a/bin/MakeProjectCreator/config/global.features
+++ b/bin/MakeProjectCreator/config/global.features
@@ -53,12 +53,18 @@ vcl           = 0
 stl           = 0
 xsc           = 0
 tao_idl_fe_gen = 0
+ace_svcconf_gen = 0
 xerces        = 0
 xerces2       = 0
 xerces3       = 0
 ofccm         = 0
 ndds          = 0
 mcpp          = 0
+wireshark     = 0
+
+dds4ccm_opendds = 0
+dds4ccm_ndds = 0
+dds4ccm_splice = 0
 
 // Features for various GUI libraries
 
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd
index 098b0bbd43c..875851f1c0f 100644
--- a/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/bin/MakeProjectCreator/templates/gnu.mpd
@@ -504,6 +504,7 @@ ifeq ($(wildcard /usr/bin/test), /usr/bin/test)
 endif
 endif
 
+SPACE = $(should_be_unset) $(should_be_unset)
 <%foreach(custom_types)%>
 <%if(custom_type->libpath)%>
 DYLD_LIBRARY_PATH := $(DYLD_LIBRARY_PATH):<%custom_type->libpath%>
@@ -513,9 +514,6 @@ LIBPATH           := $(LIBPATH):<%custom_type->libpath%>
 PATH              := $(PATH):<%custom_type->libpath%>
 
 <%endif%>
-<%if(contains(custom_type->dependent, "))%><%custom_type->dependent%>:
-
-<%endif%>
 <%foreach(custom_type->input_files)%>
 <%if(custom_type->input_file->output_files)%>
 GENERATED_DIRTY +=<%foreach(custom_type->input_file->output_files)%> <%if(flag_overrides(custom_type->input_file, gendir))%><%if(!compares(flag_overrides(custom_type->input_file, gendir),.))%><%flag_overrides(custom_type->input_file, gendir)%>/<%endif%><%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%endfor%>
@@ -535,7 +533,7 @@ ifeq ($(wildcard $(GENERATED_DIRTY)), $(GENERATED_DIRTY))
     ## If all of the generated files are there, then we need to check
     ## and make sure that the generated files are up-to-date.  If they are not
     ## then we need the special rule.
-    ifneq ($(shell<%foreach(custom_type->input_file->output_files)%> $(TEST_EXE) <%custom_type->input_file%> -nt <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%> 2> /dev/null &&<%endfor%> echo 0),)
+    ifneq ($(shell<%foreach(custom_type->input_file->output_files)%> $(TEST_EXE) "<%custom_type->input_file%>" -nt "<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%>" 2> /dev/null &&<%endfor%> echo 0),)
       .NOTPARALLEL:
 <%if(flag_overrides(custom_type->input_file, dependent))%>
     else
@@ -543,7 +541,7 @@ ifeq ($(wildcard $(GENERATED_DIRTY)), $(GENERATED_DIRTY))
       ## with respect to the source file.  Now we need to make sure that
       ## they are up-to-date with respect to the generation tool.  If the tool
       ## is newer than the generated files, then we need the special rule.
-      ifneq ($(shell<%foreach(dep, flag_overrides(custom_type->input_file, dependent))%><%foreach(custom_type->input_file->output_files)%> $(TEST_EXE) <%dep%> -nt <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%> 2> /dev/null &&<%endfor%><%endfor%> echo 0),)
+      ifneq ($(shell<%foreach(dep, flag_overrides(custom_type->input_file, dependent))%><%foreach(custom_type->input_file->output_files)%> $(TEST_EXE) "<%dep%>" -nt "<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%>" 2> /dev/null &&<%endfor%><%endfor%> echo 0),)
         .NOTPARALLEL:
       endif
 <%else%>
@@ -553,7 +551,7 @@ ifeq ($(wildcard $(GENERATED_DIRTY)), $(GENERATED_DIRTY))
       ## with respect to the source file.  Now we need to make sure that
       ## they are up-to-date with respect to the generation tool.  If the tool
       ## is newer than the generated files, then we need the special rule.
-      ifneq ($(shell<%foreach(custom_type->dependent)%><%foreach(custom_type->input_file->output_files)%> $(TEST_EXE) <%custom_type->dependent%> -nt <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%> 2> /dev/null &&<%endfor%><%endfor%> echo 0),)
+      ifneq ($(shell<%foreach(custom_type->dependent)%><%foreach(custom_type->input_file->output_files)%> $(TEST_EXE) "<%custom_type->dependent%>" -nt "<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%>" 2> /dev/null &&<%endfor%><%endfor%> echo 0),)
         .NOTPARALLEL:
       endif
 <%endif%>
@@ -567,7 +565,7 @@ else
 endif
 <%endif%>
 <%endfor%>
-<%foreach(custom_type->input_file->output_files)%><%if(flag_overrides(custom_type->input_file, gendir))%><%if(!compares(flag_overrides(custom_type->input_file, gendir),.))%><%flag_overrides(custom_type->input_file, gendir)%>/<%endif%><%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%fornotlast(" ")%><%endfor%>: <%custom_type->input_file%><%if(custom_type->input_file->dependencies)%> <%custom_type->input_file->dependencies%><%endif%><%if(flag_overrides(custom_type->input_file, dependent))%> <%flag_overrides(custom_type->input_file, dependent)%><%else%><%if(custom_type->dependent)%> <%custom_type->dependent%><%endif%><%endif%>
+<%foreach(custom_type->input_file->output_files)%><%if(flag_overrides(custom_type->input_file, gendir))%><%if(!compares(flag_overrides(custom_type->input_file, gendir),.))%><%flag_overrides(custom_type->input_file, gendir)%>/<%endif%><%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%fornotlast(" ")%><%endfor%>: <%custom_type->input_file%><%if(custom_type->input_file->dependencies)%><%foreach(custom_type->input_file->dependencies)%> <%if(contains(custom_type->input_file->dependencie, [\s\$]))%>$(subst $(SPACE),\$(SPACE),<%custom_type->input_file->dependencie%>)<%else%><%custom_type->input_file->dependencie%><%endif%><%endfor%><%endif%><%if(flag_overrides(custom_type->input_file, dependent))%><%foreach(dep, flag_overrides(custom_type->input_file, dependent))%> <%if(contains(dep, [\s\$]))%>$(subst $(SPACE),\$(SPACE),<%dep%>)<%else%><%dep%><%endif%><%endfor%><%else%><%if(custom_type->dependent)%><%foreach(custom_type->dependent)%> <%if(contains(custom_type->dependent, [\s\$]))%>$(subst $(SPACE),\$(SPACE),<%custom_type->dependent%>)<%else%><%custom_type->dependent%><%endif%><%endfor%><%endif%><%endif%>
 <%if(flag_overrides(custom_type->input_file, gendir))%>
 <%if(!compares(flag_overrides(custom_type->input_file, gendir),.))%>
 	$(MKDIR) <%flag_overrides(custom_type->input_file, gendir)%>
diff --git a/bin/PerlACE/ProcessLVRT.pm b/bin/PerlACE/ProcessLVRT.pm
index 2079346f33c..44cd400ad2d 100644
--- a/bin/PerlACE/ProcessLVRT.pm
+++ b/bin/PerlACE/ProcessLVRT.pm
@@ -345,4 +345,12 @@ CHECK:
     return -1;
 }
 
+###
+
+sub kill_all ($)
+{
+  my $procmask = shift;
+  ## NOT IMPLEMENTED YET
+}
+
 1;
diff --git a/bin/PerlACE/ProcessVX.pm b/bin/PerlACE/ProcessVX.pm
index e273e6f8ed7..842a35f70fa 100644
--- a/bin/PerlACE/ProcessVX.pm
+++ b/bin/PerlACE/ProcessVX.pm
@@ -436,18 +436,26 @@ for(my $i = 0; $i <= $#ARGV; ++$i) {
 $PerlACE::ProcessVX::WAIT_DELAY_FACTOR = $ENV{"ACE_RUNTEST_DELAY"};
 
 if (defined $ENV{'ACE_TEST_WINCE'}) {
-if ($OSNAME eq "MSWin32") {
-    require PerlACE::ProcessWinCE;
-} else {
-    require PerlACE::ProcessWinCE_Unix;
-}
+  if ($OSNAME eq "MSWin32") {
+      require PerlACE::ProcessWinCE;
+  } else {
+      require PerlACE::ProcessWinCE_Unix;
+  }
 } else {
-if ($OSNAME eq "MSWin32") {
-    require PerlACE::ProcessVX_Win32;
-}
-else {
-    require PerlACE::ProcessVX_Unix;
+  if ($OSNAME eq "MSWin32") {
+      require PerlACE::ProcessVX_Win32;
+  }
+  else {
+      require PerlACE::ProcessVX_Unix;
+  }
 }
+
+###
+
+sub kill_all ($)
+{
+  my $procmask = shift;
+  ## NOT IMPLEMENTED YET
 }
 
 1;
diff --git a/bin/PerlACE/Process_Unix.pm b/bin/PerlACE/Process_Unix.pm
index d08da933761..e1ddb7f8fde 100644
--- a/bin/PerlACE/Process_Unix.pm
+++ b/bin/PerlACE/Process_Unix.pm
@@ -533,4 +533,42 @@ sub TimedWait ($)
     return -1;
 }
 
+###
+
+sub kill_all ($)
+{
+  my $procmask = shift;
+  my $pid = -1;
+  my $first = 1;
+  my $ps_cmd = 'ps xw';
+  my $ps_file = `which ps`;
+  if ((-l $ps_file) and (readlink ($ps_file)) =~ /busybox/) {
+    ## some embedded targets use BusyBox for base tools
+    ## with different arguments
+    $ps_cmd = 'ps w';
+  }
+  if (defined $ENV{'PS_CMD'}) {
+    ## in case a special command is required
+    $ps_cmd = $ENV{'PS_CMD'};
+  }
+  for my $line (`$ps_cmd`) {
+    if ($first) {
+      # skip first line (headers)
+      $first = 0;
+    } else {
+      # find matching process line
+      if ($line =~ /$procmask/) {
+        # find process PID
+        if ($line =~ /^\s*(\d+)\s+/) {
+          $pid = $1;
+          kill ('KILL', $pid); # kill process
+          if (defined $ENV{'ACE_TEST_VERBOSE'}) {
+            print STDERR "INFO: Killed process at [$line]\n";
+          }
+        }
+      }
+    }
+  }
+}
+
 1;
diff --git a/bin/PerlACE/Process_VMS.pm b/bin/PerlACE/Process_VMS.pm
index 30d4cdd271b..6ecda65e8cd 100644
--- a/bin/PerlACE/Process_VMS.pm
+++ b/bin/PerlACE/Process_VMS.pm
@@ -356,4 +356,12 @@ sub TimedWait ($)
     return -1;
 }
 
+###
+
+sub kill_all ($)
+{
+  my $procmask = shift;
+  ## NOT IMPLEMENTED YET
+}
+
 1;
diff --git a/bin/PerlACE/Process_Win32.pm b/bin/PerlACE/Process_Win32.pm
index ace30cb05bd..c65b445bb78 100644
--- a/bin/PerlACE/Process_Win32.pm
+++ b/bin/PerlACE/Process_Win32.pm
@@ -416,4 +416,25 @@ sub TimedWait ($)
     return $self->Wait($timeout);
 }
 
+###
+
+sub kill_all ($)
+{
+  my $procmask = shift;
+  my $pid = -1;
+  for my $line (`tasklist /nh /fo csv`) {    
+    # find matching process line
+    if ($line =~ /$procmask/) {
+      # find process PID
+      if ($line =~ /^\"[^\"]+\",\"(\d+)\",/) {
+        $pid = $1;
+        Win32::Process::KillProcess ($pid, 0); # kill process
+        if (defined $ENV{'ACE_TEST_VERBOSE'}) {
+          print STDERR "INFO: Killed process at [$line]\n"
+        }
+      }
+    }
+  }
+}
+
 1;
diff --git a/bin/PerlACE/TestTarget.pm b/bin/PerlACE/TestTarget.pm
index 8fa7d9f4f30..fc56dd2faf2 100644
--- a/bin/PerlACE/TestTarget.pm
+++ b/bin/PerlACE/TestTarget.pm
@@ -339,4 +339,11 @@ sub GetStderrLog ($)
     return;
 }
 
+sub KillAll ($)
+{
+    my $self = shift;
+    my $procmask = shift;
+    PerlACE::Process::kill_all ($procmask);    
+}
+
 1;
diff --git a/bin/PerlACE/TestTarget_LVRT.pm b/bin/PerlACE/TestTarget_LVRT.pm
index a1c5207cc95..0212d4a3dd1 100644
--- a/bin/PerlACE/TestTarget_LVRT.pm
+++ b/bin/PerlACE/TestTarget_LVRT.pm
@@ -288,4 +288,11 @@ sub RebootReset ($)
     }
 }
 
+sub KillAll ($)
+{
+    my $self = shift;
+    my $procmask = shift;
+    PerlACE::ProcessLVRT::kill_all ($procmask);    
+}
+
 1;
diff --git a/bin/PerlACE/TestTarget_VxWorks.pm b/bin/PerlACE/TestTarget_VxWorks.pm
index be5f4600c27..0d97c785691 100644
--- a/bin/PerlACE/TestTarget_VxWorks.pm
+++ b/bin/PerlACE/TestTarget_VxWorks.pm
@@ -72,4 +72,11 @@ sub WaitForFileTimed ($)
     return PerlACE::waitforfile_timed ($newfile, $timeout);
 }
 
+sub KillAll ($)
+{
+    my $self = shift;
+    my $procmask = shift;
+    PerlACE::ProcessVX::kill_all ($procmask);    
+}
+
 1;
diff --git a/bin/PerlACE/TestTarget_WinCE.pm b/bin/PerlACE/TestTarget_WinCE.pm
index 17e736c95da..cfb2fb220bc 100644
--- a/bin/PerlACE/TestTarget_WinCE.pm
+++ b/bin/PerlACE/TestTarget_WinCE.pm
@@ -170,4 +170,11 @@ sub DeleteFile ($)
     unlink ("$newfile");
 }
 
+sub KillAll ($)
+{
+    my $self = shift;
+    my $procmask = shift;
+    PerlACE::ProcessVX::kill_all ($procmask);    
+}
+
 1;
diff --git a/bin/diff-builds-and-group-fixed-tests-only.sh b/bin/diff-builds-and-group-fixed-tests-only.sh
index b8a59fd75ec..1b3db772360 100755
--- a/bin/diff-builds-and-group-fixed-tests-only.sh
+++ b/bin/diff-builds-and-group-fixed-tests-only.sh
@@ -1,4 +1,4 @@
-if test -z $1; then olddate=2009_11_29; else olddate=$1; fi
+if test -z $1; then olddate=2010_01_31; else olddate=$1; fi
 if test -z $2; then newdate=`date -u +%Y_%m_%d`; else newdate=$2; fi
 if test -z $3; then prefix=`date -u +%Y%m%d%a`; else prefix=$3; fi
 if test -z $ACE_ROOT; then ACE_ROOT=..; fi
diff --git a/bin/fuzz.pl b/bin/fuzz.pl
index b467beb2da9..598c461d122 100755
--- a/bin/fuzz.pl
+++ b/bin/fuzz.pl
@@ -50,6 +50,7 @@ use PerlACE::Run_Test;
 @files_noncvs = ();
 @files_sln = ();
 @files_vcproj = ();
+@files_run_pl = ();
 
 # To keep track of errors and warnings
 $errors = 0;
@@ -122,6 +123,9 @@ sub store_file ($)
     }
     elsif ($name =~ /\.pl$/i) {
         push @files_pl, ($name);
+        if ($name =~ /^run.*\.pl$/i) {
+            push @files_run_pl, ($name);
+        }
     }
     elsif ($name =~ /\.vcproj$/i) {
         push @files_vcproj, ($name);
@@ -363,6 +367,19 @@ sub check_for_ACE_SYNCH_MUTEX ()
     }
 }
 
+# This test checks for not having export files in CIAO, all have to be ---
+# generated using TAO_IDL
+sub check_for_export_file ()
+{
+    print "Running export file check\n";
+    ITERATION: foreach $file (@files_h) {
+        if (($file =~ /.*CIAO.*export.h/)) {
+            print_error ("$file:$.: found should be generated by TAO_IDL, check -Gx** option");
+        }
+    }
+}
+
+
 # This test checks for the use of ACE_Thread_Mutex in TAO/CIAO,
 # TAO_SYNCH_MUTEX should used instead to make the code build
 # in single-threaded builds.
@@ -1367,25 +1384,18 @@ sub check_for_mismatched_filename ()
 sub check_for_bad_run_test ()
 {
     print "Running run_test.pl test\n";
-    # Add the know ACE files
-    if (defined $ENV{"TAO_ROOT"}) {
-        push @files_lst, $ENV{"TAO_ROOT"} . "/bin/tao_orb_tests.lst";
-        push @files_lst, $ENV{"TAO_ROOT"} . "/bin/tao_other_tests.lst";
-    }
-    if (defined $ENV{"CIAO_ROOT"}) {
-        push @files_lst, $ENV{"CIAO_ROOT"} . "/bin/ciao_tests.lst";
-    }
-    $config_list = new PerlACE::ConfigList;
-    foreach $file (@files_lst) {
-      $config_list->load ($file);
-    }
-    $config_list->add_one_config ("FUZZ");
-    @valid_files = $config_list->valid_entries ();
-    foreach $file (@valid_files) {
+    foreach $file (@files_run_pl) {
         if (open (FILE, $file)) {
             my $is_run_test = 0;
             my $sub = 0;
 
+            if (($file =~ /.*TAO\/examples\/Advanced.*/)) {
+              next ITERATION;
+            }
+            if (($file =~ /.*TAO\/orbsvcs\/examples\/Security\/Send_File.*/)) {
+              next ITERATION;
+            }
+
             print "Looking at file $file\n" if $opt_d;
 
             while (<FILE>) {
@@ -1414,24 +1424,24 @@ sub check_for_bad_run_test ()
                         print_error ("$file:$.: using Sys::Hostname");
                     }
 
-                    if (m/\$PerlACE::wait_interval_for_process_creation/) {
-                        print_error ("$file:$.: using \$PerlACE::wait_interval_for_process_creation");
+                    if (m/PerlACE::wait_interval_for_process_creation/) {
+                        print_error ("$file:$.: using PerlACE::wait_interval_for_process_creation");
                     }
 
-                    if (m/\$PerlACE::waitforfile_timed/) {
-                        print_error ("$file:$.: using \$PerlACE::waitforfile_timed");
+                    if (m/PerlACE::waitforfile_timed/) {
+                        print_error ("$file:$.: using PerlACE::waitforfile_timed");
                     }
 
-                    if (m/\$PerlACE::is_vxworks_test/) {
-                        print_error ("$file:$.: using \$PerlACE::is_vxworks_test");
+                    if (m/PerlACE::is_vxworks_test/) {
+                        print_error ("$file:$.: using PerlACE::is_vxworks_test");
                     }
 
-                    if (m/\$PerlACE::add_lib_path/) {
-                        print_error ("$file:$.: using \$PerlACE::add_lib_path");
+                    if (m/PerlACE::add_lib_path/) {
+                        print_error ("$file:$.: using PerlACE::add_lib_path, use AddLibPath on the target");
                     }
 
                     if (m/PerlACE::Run_Test/) {
-                        print_error ("$file:$.: using PerlACE::Run_Test, use TestTarget::random_port");
+                        print_error ("$file:$.: using PerlACE::Run_Test, use PerlACE::TestTarget");
                     }
 
                     if (m/PerlACE::random_port/) {
@@ -1450,7 +1460,7 @@ sub check_for_bad_run_test ()
                         print_error ("$file:$.: using ACE_RUN_VX_TGTHOST, use TestTarget::HostName");
                     }
 
-                    if (m/Spawn(Wait(Kill)?)?\s*\(.+\->ProcessStop\)/) {
+                    if (m/Spawn(Wait(Kill)?)?\s*\(.+\->ProcessStop.*\)/) {
                         print_error ("$file:$.: uses Stop together with Spawn");
                     }
 
@@ -1542,7 +1552,29 @@ sub check_for_absolute_ace_wrappers()
                 if (m/\~schmidt\/ACE_wrappers\//) {
                     chomp;
                     print_error ("$file:$.: ~schmidt/ACE_wrappers found");
-                    print_error ($_) if (defined $opt_v);
+                    print_error ($_);
+                }
+            }
+            close (FILE);
+        }
+        else {
+            print STDERR "Error: Could not open $file\n";
+        }
+    }
+}
+
+# Check for generated headers in the code documentation
+sub check_for_generated_headers()
+{
+    print "Running generated headers test\n";
+    foreach $file (@files_cpp, @files_inl, @files_h) {
+        if (open (FILE, $file)) {
+            print "Looking at file $file\n" if $opt_d;
+            while (<FILE>) {
+                if (m/Code generated by the The ACE ORB \(TAO\) IDL Compiler/) {
+                    chomp;
+                    print_error ("$file:$.: header found");
+                    print_error ($_);
                 }
             }
             close (FILE);
@@ -1581,7 +1613,8 @@ sub check_for_bad_ace_trace()
 
                 # Look for TRACE statements
                 if (m/ACE_OS_TRACE\s*\(\s*\"(.*)\"/
-                    || m/ACE_TRACE\s*\(\s*\"(.*)\"/) {
+                    || m/ACE_TRACE\s*\(\s*\"(.*)\"/
+                    || m/CIAO_TRACE\s*\(\s*\"(.*)\"/) {
                     my $trace = $1;
 
                     # reduce the classname
@@ -1597,7 +1630,7 @@ sub check_for_bad_ace_trace()
                         || ($trace =~ m/\:\:/ && !($trace =~ m/\Q$class\E/ && $trace =~ m/\Q$function\E/))) {
                         print_error ("$file:$.: Mismatched TRACE");
                         print_error ("$file:$.:   I see \"$trace\" but I think I'm in \""
-                                     . $class . "::" . $function . "\"") if (defined $opt_v);
+                                     . $class . "::" . $function . "\"");
                     }
                 }
             }
@@ -1728,15 +1761,15 @@ sub check_for_include ()
                 }
                 if ($disable == 0) {
                     if (/^\s*#\s*include\s*<[(ace)|(TAO)|(CIAO)]\/.*>/) {
-                        print_error ("$file:$.: include <ace\/..> used") if ($opt_v);
+                        print_error ("$file:$.: include <ace\/..> used");
                         ++$bad_occurance;
                     }
                     if (/^\s*#\s*include\s*<tao\/.*>/) {
-                        print_error ("$file:$.: include <tao\/..> used") if ($opt_v);
+                        print_error ("$file:$.: include <tao\/..> used");
                         ++$bad_occurance;
                     }
                     if (/^\s*#\s*include\s*<ciao\/.*>/) {
-                        print_error ("$file:$.: include <ciao\/..> used") if ($opt_v);
+                        print_error ("$file:$.: include <ciao\/..> used");
                         ++$bad_occurance;
                     }
                 }
@@ -1987,7 +2020,7 @@ sub check_for_ORB_init ()
 
 ##############################################################################
 
-use vars qw/$opt_c $opt_d $opt_h $opt_l $opt_t $opt_m $opt_v/;
+use vars qw/$opt_c $opt_d $opt_h $opt_l $opt_t $opt_m/;
 
 if (!getopts ('cdhl:t:mv') || $opt_h) {
     print "fuzz.pl [-cdhm] [-l level] [-t test_name][file1, file2, ...]\n";
@@ -1998,10 +2031,10 @@ if (!getopts ('cdhl:t:mv') || $opt_h) {
     print "    -l level       set detection level (default = 5)\n";
     print "    -t test_name   specify any single test to run. This will disable the run level setting\n";
     print "    -m             only check locally modified files (uses cvs)\n";
-    print "    -v             verbose mode\n";
     print "======================================================\n";
     print "list of the tests that could be run:\n";
     print "\t   check_for_noncvs_files
+           check_for_generated_headers
            check_for_synch_include
            check_for_OS_h_include
            check_for_streams_include
@@ -2064,9 +2097,10 @@ if ($opt_t) {
 print "--------------------Configuration: Fuzz - Level ",$opt_l,
       "--------------------\n";
 
+check_for_generated_headers () if ($opt_l >= 6);
 check_for_bad_run_test () if ($opt_l >= 5);
-check_for_deprecated_macros () if ($opt_l > 1 );
-check_for_refcountservantbase () if ($opt_l > 1 );
+check_for_deprecated_macros () if ($opt_l >= 1);
+check_for_refcountservantbase () if ($opt_l >= 1);
 check_for_msc_ver_string () if ($opt_l >= 3);
 check_for_empty_files () if ($opt_l >= 1);
 check_for_noncvs_files () if ($opt_l >= 1);
@@ -2099,10 +2133,11 @@ check_for_changelog_errors () if ($opt_l >= 4);
 check_for_ptr_arith_t () if ($opt_l >= 4);
 check_for_include () if ($opt_l >= 5);
 check_for_non_bool_operators () if ($opt_l > 2);
-check_for_long_file_names () if ($opt_l > 1 );
-check_for_improper_main_declaration ();
-check_for_TAO_Local_RefCounted_Object ();
-check_for_ORB_init ();
+check_for_long_file_names () if ($opt_l >= 1);
+check_for_improper_main_declaration () if ($opt_l >= 1);
+check_for_TAO_Local_RefCounted_Object () if ($opt_l >= 1);
+check_for_ORB_init () if ($opt_l >= 1);
+check_for_export_file () if ($opt_l >= 6);
 
 print "\nFuzz.pl - $errors error(s), $warnings warning(s)\n";
 
diff --git a/bin/generate_rel_manpages b/bin/generate_rel_manpages
index 0a1e14d2512..5d44d2c45ed 100755
--- a/bin/generate_rel_manpages
+++ b/bin/generate_rel_manpages
@@ -26,7 +26,7 @@ my $status= 0;
 
 my  $doxy_path = '/usr/local/bin';
 
-my $doxy_version = '1.6.1';
+my $doxy_version = '1.6.2';
 
 &can_run($doxy_path.'/doxygen --version | grep '.$doxy_version.' >/dev/null') ||
   die "$0: doxygen path or version incorrect, please fix the script\n";
diff --git a/bin/make_release.py b/bin/make_release.py
index 7a8bfb6444b..433f45a6612 100755
--- a/bin/make_release.py
+++ b/bin/make_release.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/local/bin/python2.5
 
 # @file make_release.py
 # @author William R. Otte <wotte@dre.vanderbilt.edu>
@@ -190,7 +190,7 @@ def commit (files):
     if opts.take_action:
         rev = svn_client.checkin (files,
                                   "ChangeLogTag:%s  %s  <%s>" % (release_date, signature, mailid))
-    
+
         print "Checked in files, resuling in revision ", rev.number
 
 def check_workspace ():
@@ -210,14 +210,14 @@ def check_workspace ():
     except:
         print "Unable to update the MPC workspace at " + doc_root + "/ACE/MPC"
         raise
-    
+
     # By default retrieve repo root from working copy
     if opts.repo_root is None:
         info = svn_client.info2 (doc_root + "/ACE")[0]
         opts.repo_root = info[1]["repos_root_URL"]
-       
+
     vprint ("Repos root URL = " + opts.repo_root + "\n")
-        
+
 
 def update_version_files (component):
     """ Updates the version files for a given component.  This includes
@@ -338,30 +338,30 @@ def update_spec_file ():
 def update_debianbuild ():
     """ Updates ACE_ROOT/debianbuild directory.
     - renames all files with version nrs in name to new scheme.
-    - updates version nrs in file debianbuild/control 
+    - updates version nrs in file debianbuild/control
     Currently ONLY ACE & TAO stuff is handled here """
-  
+
     global comp_versions
-  
+
     import glob
     import re
     from os.path import basename
     from os.path import dirname
     from os.path import join
-    
+
     files = list ()
     prev_ace_ver = None
     prev_tao_ver = None
-    
+
     # rename files
     mask = re.compile ("(libace|libkokyu|libtao)(.*)(\d+\.\d+\.\d+)(.*)")
-    tao = re.compile ("tao", re.IGNORECASE) 
-    
+    tao = re.compile ("tao", re.IGNORECASE)
+
     for fname in glob.iglob(doc_root + '/ACE/debianbuild/*'):
-        match = None        
-        
+        match = None
+
         fbase = basename (fname)
-        
+
         match = mask.search (fbase)
         fnewname = None
         if match is not None:
@@ -371,23 +371,23 @@ def update_debianbuild ():
             else:
                 fnewname = join (dirname (fname), match.group (1) + match.group (2) + comp_versions["ACE_version"] + match.group (4))
                 prev_ace_ver = match.group (3)
-                
+
         if fnewname is not None:
             if opts.take_action:
                 svn_client.move (fname, fnewname)
             else:
                 print "Rename: " + fname + " to " + fnewname + "\n"
-                
+
             files.append (fname)
             files.append (fnewname)
-        
+
     # update debianbuild/control
     def update_ver (match):
         if match.group (1) == 'libtao':
             return match.group (1) + match.group (2) + comp_versions["TAO_version"] + match.group (4)
         else:
             return match.group (1) + match.group (2) + comp_versions["ACE_version"] + match.group (4)
-    
+
     with open (doc_root + "/ACE/debianbuild/control", 'r+') as control_file:
         new_ctrl = ""
         for line in control_file.readlines ():
@@ -395,7 +395,7 @@ def update_debianbuild ():
                 line = mask.sub (update_ver, line)
             elif re.search ('^Replaces:', line) is not None:
                 line = line.replace (prev_ace_ver, comp_versions["ACE_version"])
-                
+
             new_ctrl += line
 
         if opts.take_action:
@@ -405,9 +405,9 @@ def update_debianbuild ():
         else:
             print "New control file:"
             print "".join (new_ctrl)
-            
+
     files.append (doc_root + "/ACE/debianbuild/control")
-            
+
     # rewrite debianbuild/dsc
     dsc_lines = """# Format: 1.0
 # Source: ace
@@ -428,9 +428,9 @@ def update_debianbuild ():
     else:
         print "New dsc file:\n"
         print dsc_lines
-            
+
     files.append (doc_root + "/ACE/debianbuild/dsc")
-            
+
     return files
 
 def get_and_update_versions ():
@@ -562,12 +562,12 @@ def update_latest_tag (which, branch):
     """ Update one of the Latest_* tags externals to point the new release """
     global opts
     root_anon = re.sub ("^https:", "svn:", opts.repo_root)
-    propval = """ACE_wrappers %s/Middleware/tags/%s/ACE
-ACE_wrappers/TAO %s/Middleware/tags/%s/TAO
-ACE_wrappers/TAO/CIAO %s/Middleware/tags/%s/CIAO
+    propval = """ACE_wrappers %s/tags/%s/ACE
+ACE_wrappers/TAO %s/tags/%s/TAO
+ACE_wrappers/TAO/CIAO %s/tags/%s/CIAO
 """ % (root_anon, branch, root_anon, branch, root_anon, branch)
     svn_client.propset ("svn:externals", propval,
-                        opts.repo_root + "/Middleware/tags/Latest_" + which)
+                        opts.repo_root + "/tags/Latest_" + which)
 
 def tag ():
     """ Tags the DOC and MPC repositories for the version """
@@ -576,12 +576,12 @@ def tag ():
     branch = "ACE+TAO+CIAO-%d_%d_%d" % (comp_versions["ACE_major"],
                                         comp_versions["ACE_minor"],
                                         comp_versions["ACE_beta"])
-                                        
-    if opts.take_action:                                        
+
+    if opts.take_action:
         # Tag middleware
-        svn_client.copy (opts.repo_root + "/Middleware/trunk",
-                        opts.repo_root + "/Middleware/tags/" + branch)
-    
+        svn_client.copy (opts.repo_root + "/trunk",
+                        opts.repo_root + "/tags/" + branch)
+
         # Tag MPC
         svn_client.copy (opts.repo_root + "/MPC/trunk",
                         opts.repo_root + "/MPC/tags/" + branch)
diff --git a/configure.ac b/configure.ac
index e40853a79da..561c1d192c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,6 +135,9 @@ AC_LANG([C++])
 dnl If we are cross compiling disable certain things in the Makefiles.
 AM_CONDITIONAL([ACE_CROSS_COMPILED], [test X$cross_compiling = Xyes])
 
+dnl If we are cross compiling disable certain things in the Makefiles.
+AM_CONDITIONAL([BUILD_CROSS_COMPILE], [test X$cross_compiling = Xyes])
+
 dnl Look for the best awk-style program available.
 AC_PROG_AWK
 
@@ -368,9 +371,6 @@ AC_DISABLE_STATIC
 dnl Enable Libtool module support
 AC_LIBTOOL_DLOPEN
 
-dnl Enable support for "clean" DLLs.
-AC_LIBTOOL_WIN32_DLL
-
 dnl
 dnl  ###### Relies on the as of yet unreleased Libtool 1.6 distribuion ###
 dnl
@@ -764,7 +764,7 @@ dnl Check if XTI headers define TCP macros that conflict with netinet/tcp.h's
 #  endif /* ACE_HAS_XTI */
 #  if !defined (ACE_LACKS_NETINET_TCP_H)
 #    include /**/ <netinet/tcp.h>
-#  endif /* !ACE_LACKS_NETIINET_TCP_H */
+#  endif /* !ACE_LACKS_NETINET_TCP_H */
         ]],[[
          int a = 0;
         ]])],[
@@ -3288,6 +3288,8 @@ ACE_CHECK_LACKS_FUNCS(strtoul)
 
 ACE_FUNC_STRTOULL
 
+ACE_CHECK_LACKS_FUNCS(floor ceil floorl ceill)
+
 # swab() comes in a number of forms:
 #   swab (const void*, void*, size_t) is POSIX, XPG4, SUS, SUSv2 standard.
 #   swab (const char*, char*, size_t) is SVID third edition.
@@ -4554,11 +4556,11 @@ if test "$ace_user_enable_reentrant_funcs" = yes; then
 #endif
                  ]],
                  [[
-  const char * name;
+  const char * name = 0;
   struct passwd * pwent;
-  char * buffer;
+  char * buffer = 0;
   int buflen;
-  struct passwd * result;
+  struct passwd * result = 0;
 
   int status = getpwnam_r (name, pwent, buffer, buflen, &result);
                  ]])],
@@ -4567,10 +4569,11 @@ if test "$ace_user_enable_reentrant_funcs" = yes; then
                     AC_DEFINE([ACE_HAS_POSIX_GETPWNAM_R])
                   fi
                  ],
-                 [
+                [
                   dnl Nothing to do!
-                 ])
-                ],
+                  echo
+                ]),
+                ],,
                 [AC_DEFINE([ACE_LACKS_PWD_REENTRANT_FUNCTIONS])])
 
   AC_CHECK_FUNC([ctime_r],,)
diff --git a/debianbuild/control b/debianbuild/control
index 72e7463177c..c514799dd6f 100644
--- a/debianbuild/control
+++ b/debianbuild/control
@@ -2,10 +2,10 @@ Source: ace
 Section: devel
 Priority: optional
 Maintainer: Debian ACE+TAO maintainers <pkg-ace-devel@lists.alioth.debian.org>
-Uploaders: Konstantinos Margaritis <markos@debian.org>, Brian Nelson <pyro@debian.org>, Thomas Girard <thomas.g.girard@free.fr>
-Build-Depends: debhelper (>= 5), libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.4.7), libfox-1.6-dev, zlib1g-dev, libzzip-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen
+Uploaders: Thomas Girard <thomas.g.girard@free.fr>, Pau Garcia i Quiles <pgquiles@elpauer.org>
+Build-Depends: debhelper (>= 5), libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.4.7), libfox-1.6-dev, zlib1g-dev, libzzip-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz
 Build-Conflicts: autoconf2.13, automake1.4
-Standards-Version: 3.8.3.0
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ace/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ace/trunk
 Homepage: http://www.cs.wustl.edu/~schmidt/ACE.html
@@ -15,7 +15,7 @@ Architecture: all
 Section: devel
 Depends: ${perl:Depends}, ${misc:Depends}
 Recommends: make
-Replaces: libace-dev (< 5.7.5-1)
+Replaces: libace-dev (< 5.7.6-1)
 Suggests: libace-dev, pkg-config
 Description: makefile, project and workspace creator
  This package contains the Makefile, Project and Workspace Creator (MPC)
@@ -28,7 +28,7 @@ Description: makefile, project and workspace creator
   * mpc-ace, generating project files for a single target
   * mwc-ace, generating workspace files for a set of projects
 
-Package: libace-5.7.5
+Package: libace-5.7.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -54,9 +54,9 @@ Description: C++ network programming framework
 Package: libace-dev
 Architecture: any
 Section: libdevel
-Depends: libace-5.7.5 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-5.7.6 (= ${binary:Version}), ${misc:Depends}
 Suggests: libace-doc, libtao-dev, pkg-config
-Replaces: mpc-ace (<< 5.7.5-4)
+Replaces: mpc-ace (<< 5.7.6-4)
 Description: C++ network programming framework development files
  This package contains the header files and static library for the ACE
  framework.
@@ -70,7 +70,7 @@ Description: C++ network programming framework documentation
  This package contains the ACE overview documentation, tutorials,
  examples, and information regarding upstream development.
 
-Package: libace-ssl-5.7.5
+Package: libace-ssl-5.7.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -81,12 +81,12 @@ Description: ACE secure socket layer library
 Package: libace-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libace-ssl-5.7.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 5.7.5d)
+Depends: ${misc:Depends}, libace-ssl-5.7.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 5.7.6d)
 Description: ACE secure socket layer library development files
  This package contains the header files and static library for the ACE
  SSL library.
 
-Package: libace-rmcast-5.7.5
+Package: libace-rmcast-5.7.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -100,12 +100,12 @@ Description: ACE reliable multicast library
 Package: libace-rmcast-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libace-rmcast-5.7.5 (= ${binary:Version}), libace-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libace-rmcast-5.7.6 (= ${binary:Version}), libace-dev (= ${binary:Version})
 Description: ACE reliable multicast library development files
  This package contains the header files and static library for the ACE
  reliable multicast library.
 
-Package: libace-tmcast-5.7.5
+Package: libace-tmcast-5.7.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -118,12 +118,12 @@ Description: ACE transactional multicast library
 Package: libace-tmcast-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libace-tmcast-5.7.5 (= ${binary:Version}), libace-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libace-tmcast-5.7.6 (= ${binary:Version}), libace-dev (= ${binary:Version})
 Description: ACE transactional multicast library development files
  This package contains the header files and static library for the ACE
  transactional multicast library.
 
-Package: libace-htbp-5.7.5
+Package: libace-htbp-5.7.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -137,7 +137,7 @@ Description: ACE protocol over HTTP tunneling library
 Package: libace-htbp-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libace-htbp-5.7.5 (= ${binary:Version}), libace-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libace-htbp-5.7.6 (= ${binary:Version}), libace-dev (= ${binary:Version})
 Description: ACE protocol over HTTP tunneling library development files
  This package contains the header files and static library for the ACE
  HTBP library.
@@ -153,7 +153,7 @@ Description: ACE perfect hash function generator
  basically the same options and functionality. gperf-ace simply takes
  advantage of the some of the features provided by the ACE library.
 
-Package: libacexml-5.7.5
+Package: libacexml-5.7.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -168,16 +168,16 @@ Description: ACE SAX based XML parsing library
 Package: libacexml-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libacexml-5.7.5 (= ${binary:Version}), libace-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libacexml-5.7.6 (= ${binary:Version}), libace-dev (= ${binary:Version})
 Description: ACE SAX based XML parsing library development files
  This package contains the header files and static library for the ACE
  XML parsing library.
 
-Package: libkokyu-5.7.5
+Package: libkokyu-5.7.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libtao-1.7.4, libtao-orbsvcs-1.7.5
+Suggests: libtao-1.7.4, libtao-orbsvcs-1.7.6
 Description: ACE scheduling and dispatching library
  Kokyu is a library designed to provide flexible scheduling and
  dispatching services.
@@ -188,12 +188,12 @@ Description: ACE scheduling and dispatching library
 Package: libkokyu-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libkokyu-5.7.5 (= ${binary:Version}), libace-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libkokyu-5.7.6 (= ${binary:Version}), libace-dev (= ${binary:Version})
 Description: ACE scheduling and dispatching library development files
  This package contains the header files and static library for the ACE
  scheduling and dispatching library.
 
-Package: libace-qtreactor-5.7.5
+Package: libace-qtreactor-5.7.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -212,12 +212,12 @@ Description: ACE-GUI reactor integration for Qt
 Package: libace-qtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libace-qtreactor-5.7.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev
+Depends: ${misc:Depends}, libace-qtreactor-5.7.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev
 Description: ACE-GUI reactor integration for Qt development files
  This package contains header files and static library for the ACE-Qt
  reactor integration.
 
-Package: libace-xtreactor-5.7.5
+Package: libace-xtreactor-5.7.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -235,12 +235,12 @@ Description: ACE-GUI reactor integration for Xt
 Package: libace-xtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libace-xtreactor-5.7.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 5.7.5)
+Depends: ${misc:Depends}, libace-xtreactor-5.7.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 5.7.6)
 Description: ACE-GUI reactor integration for Xt development files
  This package contains header files and static library for the ACE-Xt
  reactor integration.
 
-Package: libace-tkreactor-5.7.5
+Package: libace-tkreactor-5.7.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -258,12 +258,12 @@ Description: ACE-GUI reactor integration for Tk
 Package: libace-tkreactor-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libace-tkreactor-5.7.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 5.7.5)
+Depends: ${misc:Depends}, libace-tkreactor-5.7.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 5.7.6)
 Description: ACE-GUI reactor integration for Tk development files
  This package contains header files and static library for the ACE-Tk
  reactor integration.
 
-Package: libace-flreactor-5.7.5
+Package: libace-flreactor-5.7.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -280,12 +280,12 @@ Description: ACE-GUI reactor integration for Fl
 Package: libace-flreactor-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libace-flreactor-5.7.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 5.7.5)
+Depends: ${misc:Depends}, libace-flreactor-5.7.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 5.7.6)
 Description: ACE-GUI reactor integration for Fl development files
  This package contains header files and static library for the ACE-Fl
  reactor integration.
 
-Package: libace-foxreactor-5.7.5
+Package: libace-foxreactor-5.7.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -302,12 +302,12 @@ Description: ACE-GUI reactor integration for FOX
 Package: libace-foxreactor-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libace-foxreactor-5.7.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev
+Depends: ${misc:Depends}, libace-foxreactor-5.7.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev
 Description: ACE-GUI reactor integration for FOX development files
  This package contains header files and static library for the ACE-FOX
  reactor integration.
 
-Package: libtao-1.7.5
+Package: libtao-1.7.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -321,7 +321,7 @@ Description: ACE based CORBA ORB core libraries
 Package: libtao-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libtao-1.7.5 (= ${binary:Version}), libace-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libtao-1.7.6 (= ${binary:Version}), libace-dev (= ${binary:Version})
 Suggests: libtao-doc, libtao-orbsvcs-dev
 Description: ACE based CORBA ORB core libraries development files
  This package contains the header files for TAO.  Due to the size of the
@@ -336,7 +336,7 @@ Description: ACE based CORBA ORB core libraries documentation
  This package contains the TAO overview documentation, tutorials,
  examples, and information regarding upstream development.
 
-Package: libtao-orbsvcs-1.7.5
+Package: libtao-orbsvcs-1.7.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -346,14 +346,14 @@ Description: TAO CORBA services libraries
 Package: libtao-orbsvcs-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libtao-orbsvcs-1.7.5 (= ${binary:Version}), libtao-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libtao-orbsvcs-1.7.6 (= ${binary:Version}), libtao-dev (= ${binary:Version})
 Description: TAO CORBA services development files
  This package contains the header files for the TAO CORBA services.
  .
  Due to the size of the static libs (> 400MB) they have been left out.
  The examples and some documentation have been included as well.
 
-Package: libtao-qtresource-1.7.5
+Package: libtao-qtresource-1.7.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -363,12 +363,12 @@ Description: TAO-GUI reactor integration for Qt
 Package: libtao-qtresource-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libtao-qtresource-1.7.5 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libtao-qtresource-1.7.6 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version})
 Description: TAO-GUI reactor integration for Qt development files
  This package contains header files and static library for the TAO-Qt
  reactor integration.
 
-Package: libtao-xtresource-1.7.5
+Package: libtao-xtresource-1.7.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -378,12 +378,12 @@ Description: TAO-GUI reactor integration for Xt
 Package: libtao-xtresource-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libtao-xtresource-1.7.5 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libtao-xtresource-1.7.6 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version})
 Description: TAO-GUI reactor integration for Xt development files
  This package contains header files and static library for the TAO-Xt
  reactor integration.
 
-Package: libtao-flresource-1.7.5
+Package: libtao-flresource-1.7.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -393,12 +393,12 @@ Description: TAO-GUI reactor integration for Fl
 Package: libtao-flresource-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libtao-flresource-1.7.5 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libtao-flresource-1.7.6 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version})
 Description: TAO-GUI reactor integration for Fl development files
  This package contains header files and static library for the TAO-Fl
  reactor integration.
 
-Package: libtao-tkresource-1.7.5
+Package: libtao-tkresource-1.7.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -408,12 +408,12 @@ Description: TAO-GUI reactor integration for Tk development files
 Package: libtao-tkresource-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libtao-tkresource-1.7.5 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libtao-tkresource-1.7.6 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version})
 Description: TAO-GUI reactor integration for Tk development files
  This package contains header files and static library for the TAO-Tk
  reactor integration.
 
-Package: libtao-foxresource-1.7.5
+Package: libtao-foxresource-1.7.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -423,7 +423,7 @@ Description: TAO-GUI reactor integration for FOX
 Package: libtao-foxresource-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libtao-foxresource-1.7.5 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libtao-foxresource-1.7.6 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version})
 Description: TAO-GUI reactor integration for FOX development files
  This package contains header files and static library for the TAO-FOX
  reactor integration.
diff --git a/debianbuild/dsc b/debianbuild/dsc
index 3c1075fabf4..7f1d6a50723 100644
--- a/debianbuild/dsc
+++ b/debianbuild/dsc
@@ -1,10 +1,10 @@
 # Format: 1.0
 # Source: ace
-# Version: 1.7.5
+# Version: 1.7.6
 # Binary: ace
 # Maintainer: Johnny Willemsen  <jwillemsen@remedy.nl>
 # Architecture: any
 # Build-Depends: g++
 # Files:
-#  <hash> <size> ACE+TAO+CIAO-src-5.7.5.tar.bz2
+#  <hash> <size> ACE+TAO+CIAO-src-5.7.6.tar.bz2
 #
diff --git a/debianbuild/libace-5.7.5.docs b/debianbuild/libace-5.7.6.docs
index e367841dc93..e367841dc93 100644
--- a/debianbuild/libace-5.7.5.docs
+++ b/debianbuild/libace-5.7.6.docs
diff --git a/debianbuild/libace-5.7.5.install b/debianbuild/libace-5.7.6.install
index c1cbf26a13f..c1cbf26a13f 100644
--- a/debianbuild/libace-5.7.5.install
+++ b/debianbuild/libace-5.7.6.install
diff --git a/debianbuild/libace-flreactor-5.7.5.install b/debianbuild/libace-flreactor-5.7.6.install
index 550aa832bf0..550aa832bf0 100644
--- a/debianbuild/libace-flreactor-5.7.5.install
+++ b/debianbuild/libace-flreactor-5.7.6.install
diff --git a/debianbuild/libace-foxreactor-5.7.5.install b/debianbuild/libace-foxreactor-5.7.6.install
index fd0fc562b85..fd0fc562b85 100644
--- a/debianbuild/libace-foxreactor-5.7.5.install
+++ b/debianbuild/libace-foxreactor-5.7.6.install
diff --git a/debianbuild/libace-htbp-5.7.5.install b/debianbuild/libace-htbp-5.7.6.install
index 9467b8be94b..9467b8be94b 100644
--- a/debianbuild/libace-htbp-5.7.5.install
+++ b/debianbuild/libace-htbp-5.7.6.install
diff --git a/debianbuild/libace-qtreactor-5.7.5.install b/debianbuild/libace-qtreactor-5.7.6.install
index 7b9064dfd86..7b9064dfd86 100644
--- a/debianbuild/libace-qtreactor-5.7.5.install
+++ b/debianbuild/libace-qtreactor-5.7.6.install
diff --git a/debianbuild/libace-rmcast-5.7.5.install b/debianbuild/libace-rmcast-5.7.6.install
index 20aeea4c29b..20aeea4c29b 100644
--- a/debianbuild/libace-rmcast-5.7.5.install
+++ b/debianbuild/libace-rmcast-5.7.6.install
diff --git a/debianbuild/libace-ssl-5.7.5.install b/debianbuild/libace-ssl-5.7.6.install
index 46f38fe8510..46f38fe8510 100644
--- a/debianbuild/libace-ssl-5.7.5.install
+++ b/debianbuild/libace-ssl-5.7.6.install
diff --git a/debianbuild/libace-tkreactor-5.7.5.install b/debianbuild/libace-tkreactor-5.7.6.install
index 38a14bc655f..38a14bc655f 100644
--- a/debianbuild/libace-tkreactor-5.7.5.install
+++ b/debianbuild/libace-tkreactor-5.7.6.install
diff --git a/debianbuild/libace-tmcast-5.7.5.install b/debianbuild/libace-tmcast-5.7.6.install
index 024bf2de1bb..024bf2de1bb 100644
--- a/debianbuild/libace-tmcast-5.7.5.install
+++ b/debianbuild/libace-tmcast-5.7.6.install
diff --git a/debianbuild/libace-xtreactor-5.7.5.install b/debianbuild/libace-xtreactor-5.7.6.install
index f981828eb55..f981828eb55 100644
--- a/debianbuild/libace-xtreactor-5.7.5.install
+++ b/debianbuild/libace-xtreactor-5.7.6.install
diff --git a/debianbuild/libacexml-5.7.5.docs b/debianbuild/libacexml-5.7.6.docs
index 4ebd1c55c18..4ebd1c55c18 100644
--- a/debianbuild/libacexml-5.7.5.docs
+++ b/debianbuild/libacexml-5.7.6.docs
diff --git a/debianbuild/libacexml-5.7.5.install b/debianbuild/libacexml-5.7.6.install
index 2c0837e6b38..2c0837e6b38 100644
--- a/debianbuild/libacexml-5.7.5.install
+++ b/debianbuild/libacexml-5.7.6.install
diff --git a/debianbuild/libkokyu-5.7.5.docs b/debianbuild/libkokyu-5.7.6.docs
index 35ee2dbe99c..35ee2dbe99c 100644
--- a/debianbuild/libkokyu-5.7.5.docs
+++ b/debianbuild/libkokyu-5.7.6.docs
diff --git a/debianbuild/libkokyu-5.7.5.install b/debianbuild/libkokyu-5.7.6.install
index 6bd63ce5377..6bd63ce5377 100644
--- a/debianbuild/libkokyu-5.7.5.install
+++ b/debianbuild/libkokyu-5.7.6.install
diff --git a/debianbuild/libtao-1.7.5.docs b/debianbuild/libtao-1.7.6.docs
index a79beab3449..a79beab3449 100644
--- a/debianbuild/libtao-1.7.5.docs
+++ b/debianbuild/libtao-1.7.6.docs
diff --git a/debianbuild/libtao-1.7.5.install b/debianbuild/libtao-1.7.6.install
index 38fc18caa42..38fc18caa42 100644
--- a/debianbuild/libtao-1.7.5.install
+++ b/debianbuild/libtao-1.7.6.install
diff --git a/debianbuild/libtao-flresource-1.7.5.install b/debianbuild/libtao-flresource-1.7.6.install
index 5387bf74f53..5387bf74f53 100644
--- a/debianbuild/libtao-flresource-1.7.5.install
+++ b/debianbuild/libtao-flresource-1.7.6.install
diff --git a/debianbuild/libtao-foxresource-1.7.5.install b/debianbuild/libtao-foxresource-1.7.6.install
index bfaad19f8eb..bfaad19f8eb 100644
--- a/debianbuild/libtao-foxresource-1.7.5.install
+++ b/debianbuild/libtao-foxresource-1.7.6.install
diff --git a/debianbuild/libtao-orbsvcs-1.7.5.NEWS b/debianbuild/libtao-orbsvcs-1.7.6.NEWS
index ea0759e0ade..ea0759e0ade 100644
--- a/debianbuild/libtao-orbsvcs-1.7.5.NEWS
+++ b/debianbuild/libtao-orbsvcs-1.7.6.NEWS
diff --git a/debianbuild/libtao-orbsvcs-1.7.5.install b/debianbuild/libtao-orbsvcs-1.7.6.install
index 59883c71dea..59883c71dea 100644
--- a/debianbuild/libtao-orbsvcs-1.7.5.install
+++ b/debianbuild/libtao-orbsvcs-1.7.6.install
diff --git a/debianbuild/libtao-qtresource-1.7.5.install b/debianbuild/libtao-qtresource-1.7.6.install
index b5af230536e..b5af230536e 100644
--- a/debianbuild/libtao-qtresource-1.7.5.install
+++ b/debianbuild/libtao-qtresource-1.7.6.install
diff --git a/debianbuild/libtao-tkresource-1.7.5.install b/debianbuild/libtao-tkresource-1.7.6.install
index 9de803ef62b..9de803ef62b 100644
--- a/debianbuild/libtao-tkresource-1.7.5.install
+++ b/debianbuild/libtao-tkresource-1.7.6.install
diff --git a/debianbuild/libtao-xtresource-1.7.5.install b/debianbuild/libtao-xtresource-1.7.6.install
index b6a1ca56d3c..b6a1ca56d3c 100644
--- a/debianbuild/libtao-xtresource-1.7.5.install
+++ b/debianbuild/libtao-xtresource-1.7.6.install
diff --git a/debianbuild/patches/00list b/debianbuild/patches/00list
index 58876f97286..d77c48fbc12 100644
--- a/debianbuild/patches/00list
+++ b/debianbuild/patches/00list
@@ -1,9 +1,6 @@
 01-change-tao-sonames
-02-fltk-no-gl
 02-qt4
 04-reduce-opt
-12-fix-fox-include
-15-fix-fltk-include
 34-bts386713
 50-prepatch-dummy-mark
 92-default-ACE_ROOT
diff --git a/debianbuild/patches/02-fltk-no-gl.dpatch b/debianbuild/patches/02-fltk-no-gl.dpatch
deleted file mode 100644
index 1828c31e2b0..00000000000
--- a/debianbuild/patches/02-fltk-no-gl.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-fltk-no-gl.dpatch by Thomas Girard <thomas.g.girard@free.fr>
-##
-## DP: do not link against libfltk_gl
-
-@DPATCH@
---- ACE_wrappers.orig/m4/ace.m4
-+++ ACE_wrappers/m4/ace.m4
-@@ -1180,8 +1180,8 @@
-    fi
-  fi
-  if test X"${FLTKCONFIG}" != X; then
--   ACE_FLTK_CPPFLAGS=`$FLTKCONFIG --use-gl --cxxflags 2>/dev/null`
--   ACE_FLTK_LIBS=`$FLTKCONFIG --use-gl --ldflags 2>/dev/null`
-+   ACE_FLTK_CPPFLAGS=`$FLTKCONFIG --cxxflags 2>/dev/null`
-+   ACE_FLTK_LIBS=`$FLTKCONFIG --ldflags 2>/dev/null`
- 
-    AC_SUBST(ACE_FLTK_CPPFLAGS)
-    AC_SUBST(ACE_FLTK_LIBS)
diff --git a/debianbuild/patches/02-qt4.dpatch b/debianbuild/patches/02-qt4.dpatch
index 5a0501f024b..1677c008477 100644
--- a/debianbuild/patches/02-qt4.dpatch
+++ b/debianbuild/patches/02-qt4.dpatch
@@ -2,12 +2,12 @@
 ## 02-qt4.dpatch by Thomas Girard <thomas.g.girard@free.fr>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: detect Qt4 instead of Qt3
+## DP: use Qt4 instead of Qt3
 
 @DPATCH@
 --- ACE_wrappers.orig/m4/ace.m4
 +++ ACE_wrappers/m4/ace.m4
-@@ -1265,18 +1265,18 @@
+@@ -1195,18 +1195,18 @@
  AC_DEFUN([ACE_PATH_QT],
  [
   ac_qt_found=no
diff --git a/debianbuild/patches/03-g++-new-throws.dpatch b/debianbuild/patches/03-g++-new-throws.dpatch
new file mode 100644
index 00000000000..54f3b631ae9
--- /dev/null
+++ b/debianbuild/patches/03-g++-new-throws.dpatch
@@ -0,0 +1,68 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03-g++-new-throws.dpatch by Thomas Girard <thomas.g.girard@free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: don't test if new() throws std::bad_alloc
+
+@DPATCH@
+--- orig/configure.ac
++++ mod/configure.ac
+@@ -5224,57 +5224,7 @@
+   ACE_CACHE_CHECK([if new throws std::bad_alloc exception on failure],
+     [ace_cv_new_throws_bad_alloc_exception],
+     [
+-     AC_RUN_IFELSE([AC_LANG_SOURCE([[
+-#if defined (ACE_HAS_NEW_NO_H)
+-# include <new>
+-#elif defined (ACE_HAS_NEW_H)
+-# include <new.h>
+-#endif
+-
+-#if defined (ACE_HAS_STDEXCEPT_NO_H)
+-# include <stdexcept>
+-#elif defined (ACE_HAS_EXCEPTION_H)
+-# include <exception.h>
+-#endif
+-
+-/* We already checked for ACE_LACKS_NUMERIC_LIMITS */
+-#if !defined ACE_LACKS_NUMERIC_LIMITS
+-#include <limits>
+-#endif
+-
+-        int main(int, char *[]) {
+-#if defined ACE_LACKS_NUMERIC_LIMITS
+-          const size_t ALLOC_SIZE = 2 * 1024 * 1024 * 1024;
+-#else
+-          const size_t ALLOC_SIZE = std::numeric_limits<size_t>::max () / 2;
+-#endif
+-          while (1) {
+-            try {
+-              char *a = new char[ALLOC_SIZE];
+-              if (a == 0) {
+-                return 1; /* new() does NOT throw exceptions */
+-              }
+-            }
+-
+-#ifdef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
+-            catch (std::bad_alloc)
+-#else
+-            catch (bad_alloc)
+-#endif  /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
+-            {
+-             return 0; /* new() does throw exceptions */
+-            }
+-         };
+-
+-         return 1;  /* ERROR: We shouldn't get this far! */
+-        }
+-       ]])],[
+-        ace_cv_new_throws_bad_alloc_exception=yes
+-       ],[
+-        ace_cv_new_throws_bad_alloc_exception=no
+-       ],[
+-        ace_cv_new_throws_bad_alloc_exception=no
+-       ])
++     ace_cv_new_throws_bad_alloc_exception=yes
+     ], [AC_DEFINE([ACE_NEW_THROWS_EXCEPTIONS])],)
+ 
+   if test "$ace_cv_new_throws_bad_alloc_exception" != yes; then
diff --git a/debianbuild/patches/04-reduce-opt.dpatch b/debianbuild/patches/04-reduce-opt.dpatch
index 7f072829c7e..789603cf5ee 100644
--- a/debianbuild/patches/04-reduce-opt.dpatch
+++ b/debianbuild/patches/04-reduce-opt.dpatch
@@ -2,7 +2,8 @@
 ## 04-reduce-opt.dpatch by Thomas Girard <thomas.g.girard@free.fr>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: drop -O3 default optimization level
+## DP: drop -O3 default optimization level. Please note that
+## DP: -O2 level is set when using autoconf method.
 
 @DPATCH@
 --- ACE_wrappers.orig/m4/compiler.m4
diff --git a/debianbuild/patches/05-autoconf-fox.dpatch b/debianbuild/patches/05-autoconf-fox.dpatch
deleted file mode 100644
index 0315ab11eec..00000000000
--- a/debianbuild/patches/05-autoconf-fox.dpatch
+++ /dev/null
@@ -1,116 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05-autoconf-fox.dpatch by Thomas Girard <thomas.g.girard@free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: add autoconf support for Fox
-
-@DPATCH@
---- ACE_wrappers.orig/m4/ace.m4
-+++ ACE_wrappers/m4/ace.m4
-@@ -501,6 +501,7 @@
-  ACE_ENABLE_QT_REACTOR
-  ACE_ENABLE_TK_REACTOR
-  ACE_ENABLE_XT_REACTOR
-+ ACE_ENABLE_FOX_REACTOR
- 
-  # placeholder for WxWindows/wxWidgets support
-  AM_CONDITIONAL([BUILD_WXWINDOWS], false)
-@@ -1543,4 +1544,58 @@
-                [test X$ace_user_enable_xt_reactor = Xyes])
- ])
- 
-+# ACE_PATH_FOX
-+#---------------------------------------------------------------------------
-+AC_DEFUN([ACE_PATH_FOX],
-+[AC_ARG_WITH([fox-config],
-+ AS_HELP_STRING([--with-fox-config=PATH],
-+                [path to fox-config [[automatic]]]),
-+ [ ac_fox_config="${withval}" ])
-+ if test X"${ac_fox_config}" = X; then
-+   AC_PATH_PROG([FOXCONFIG], [fox-config], [], [])
-+ else
-+  AC_MSG_CHECKING([whether ${ac_fox_config} exists])
-+   if test -f "${ac_fox_config}"; then
-+     FOXCONFIG="${ac_fox_config}"
-+     AC_MSG_RESULT([yes])
-+   else
-+     AC_MSG_RESULT([no])
-+   fi
-+ fi
-+ if test X"${FOXCONFIG}" != X; then
-+   ACE_FOX_CPPFLAGS=-I/usr/include/fox-1.6
-+   ACE_FOX_LIBS=-lFOX-1.6
-+   AC_SUBST(ACE_FOX_CPPFLAGS)
-+   AC_SUBST(ACE_FOX_LIBS)
-+ fi
-+])
- 
-+# ACE_ENABLE_FOX_REACTOR
-+#---------------------------------------------------------------------------
-+AC_DEFUN([ACE_ENABLE_FOX_REACTOR],
-+[AC_REQUIRE([ACE_PATH_FOX])
-+AC_ARG_ENABLE([fox-reactor],
-+               AS_HELP_STRING([--enable-fox-reactor],
-+                              [build support for the FoxReactor [[no]]]),
-+               [case "${enableval}" in
-+                 yes)
-+                   AS_IF([test X"${FOXCONFIG}" != X],
-+                         [ace_user_enable_fox_reactor=yes],
-+                         [AC_MSG_ERROR([ACE_FoxReactor cannot be enabled: fox-config not found.])])
-+                   ;;
-+                 no)
-+                   ace_user_enable_fox_reactor=no
-+                   ;;
-+                 *)
-+                   AC_MSG_ERROR([bad value ${enableval} for --enable-fox-reactor])
-+		   ;;
-+	       esac],
-+               [
-+                 ace_user_enable_fox_reactor=no
-+               ])
-+AM_CONDITIONAL([BUILD_FOX], [test X$ace_user_enable_fox_reactor = Xyes])
-+AM_CONDITIONAL([BUILD_ACE_FOXREACTOR],
-+               [test X$ace_user_enable_fox_reactor = Xyes])
-+AM_CONDITIONAL([BUILD_TAO_FOXRESOURCE],
-+               [test X$ace_user_enable_fox_reactor = Xyes])
-+])
---- ACE_wrappers.orig/bin/MakeProjectCreator/config/global.features
-+++ ACE_wrappers/bin/MakeProjectCreator/config/global.features
-@@ -90,6 +90,8 @@
- ace_tkreactor    = 1
- // Use FlReactor
- ace_flreactor    = 1
-+// Use FoxReactor
-+ace_foxreactor   = 1
- 
- // Features for TAO support for various GUI libraries
- // Use QtResources for TAO
-@@ -100,6 +102,8 @@
- tao_tkresource    = 1
- // Use FlResources for TAO
- tao_flresource    = 1
-+// Use FoxResources for TAO
-+tao_foxresource   = 1
- 
- //Use the ZIP_Wrapper feature for when using the ZIP wrapper classes
- ZIP_Wrapper = 0
---- ACE_wrappers.orig/ace/ace.mwc
-+++ ACE_wrappers/ace/ace.mwc
-@@ -6,6 +6,7 @@
-   ace.mpc
-   ace_for_tao.mpc
-   ace_flreactor.mpc
-+  ace_foxreactor.mpc
-   ace_qtreactor.mpc
-   ace_tkreactor.mpc
-   ace_xtreactor.mpc
---- ACE_wrappers.orig/TAO/configure.ac
-+++ ACE_wrappers/TAO/configure.ac
-@@ -183,6 +183,7 @@
- ACE_ENABLE_QT_REACTOR
- ACE_ENABLE_TK_REACTOR
- ACE_ENABLE_XT_REACTOR
-+ACE_ENABLE_FOX_REACTOR
- ACE_PATH_ZZIP
- ACE_PATH_ZLIB
- 
diff --git a/debianbuild/patches/06-fix-kokyu-mpc.dpatch b/debianbuild/patches/06-fix-kokyu-mpc.dpatch
deleted file mode 100644
index 9d08731ca6f..00000000000
--- a/debianbuild/patches/06-fix-kokyu-mpc.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06-revert-mpc-kokyu-change.dpatch by Thomas Girard <thomas.g.girard@free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: use upstream patch to unbreak Kokyu library search path
-
-@DPATCH@
---- ACE_wrappers.orig/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm
-+++ ACE_wrappers/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm
-@@ -135,7 +135,7 @@
-         $reldir = 'Kokyu';
-       }
-     }
--    $str =~ s!$libname!\$(top_builddir)/$reldir/$libname!;
-+    $str =~ s!$libname!\$(ACE_BUILDDIR)/$reldir/$libname!;
-     return $str;
-   }
-   elsif ($libname =~ /^lib(tao|kokyu)/i) {
diff --git a/debianbuild/patches/07-autoconf-fix-gperf.dpatch b/debianbuild/patches/07-autoconf-fix-gperf.dpatch
deleted file mode 100644
index 27332fe00b8..00000000000
--- a/debianbuild/patches/07-autoconf-fix-gperf.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07-autoconf-fix-gperf.dpatch by Thomas Girard <thomas.g.girard@free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix an autotools error in GPERF handling.
-
-@DPATCH@
---- ACE_wrappers.orig/m4/ace.m4
-+++ ACE_wrappers/m4/ace.m4
-@@ -535,7 +535,7 @@
-      AC_MSG_WARN([existing gperf may be overwritten during installation])
-     ],[])
-  fi
-- AM_CONDITIONAL([COMPILE_GPERF], [test X$ace_user_enable_gperf = Xyes])
-+ AM_CONDITIONAL([BUILD_GPERF], [test X$ace_user_enable_gperf = Xyes])
- 
-  ACE_ENABLE_QOS
-  ACE_ENABLE_SSL
diff --git a/debianbuild/patches/12-fix-fox-include.dpatch b/debianbuild/patches/12-fix-fox-include.dpatch
deleted file mode 100644
index 26ff9767537..00000000000
--- a/debianbuild/patches/12-fix-fox-include.dpatch
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12-fix-fox-include.dpatch by Thomas Girard <thomas.g.girard@free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: drop fox/ prefix in include, it's correctly set by fox-config
-
-@DPATCH@
---- ACE_wrappers.orig/ace/FoxReactor/FoxReactor.h
-+++ ACE_wrappers/ace/FoxReactor/FoxReactor.h
-@@ -27,7 +27,7 @@
- 
- #include "ace/Select_Reactor.h"
- 
--#include <fox/fx.h>
-+#include <fx.h>
- 
- /**
-  * @class ACE_FoxReactor
---- ACE_wrappers.orig/TAO/tao/FoxResource/FoxResource_Loader.h
-+++ ACE_wrappers/TAO/tao/FoxResource/FoxResource_Loader.h
-@@ -24,7 +24,7 @@
- 
- #include "tao/Versioned_Namespace.h"
- 
--#include <fox/fx.h>
-+#include <fx.h>
- 
- TAO_BEGIN_VERSIONED_NAMESPACE_DECL
- 
diff --git a/debianbuild/patches/14-autoconf-tao.dpatch b/debianbuild/patches/14-autoconf-tao.dpatch
deleted file mode 100644
index f13d0e95d50..00000000000
--- a/debianbuild/patches/14-autoconf-tao.dpatch
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 14-autoconf-tao.dpatch by Thomas Girard <thomas.g.girard@free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: enhance TAO autoconf support
-
-@DPATCH@
---- ACE_wrappers.orig/TAO/configure.ac
-+++ ACE_wrappers/TAO/configure.ac
-@@ -124,10 +124,6 @@
- AC_PROG_CXX
- AC_PROG_CXXCPP
- 
--dnl Configure libtool
--AC_DISABLE_STATIC
--AC_PROG_LIBTOOL
--
- ACE_CHECK_THREADS
- 
- dnl Set the test language as C++
-@@ -190,6 +186,33 @@
- TAO_ENABLE_EXAMPLES
- TAO_ENABLE_TESTS
- 
-+dnl The user's/default C++ flags are stored in "CXXFLAGS."  We use
-+dnl the variable "ACE_CXXFLAGS" to set the C++ flags we want.  At the end
-+dnl of the configuration process we combine ACE_CXXFLAGS and CXXFLAGS
-+dnl into CXXFLAGS (e.g., CXXFLAGS="$ACE_CXXFLAGS $CXXFLAGS").  CXXFLAGS
-+dnl goes after ACE_CXXFLAGS so that the user's C++ flag command line
-+dnl choices always override the configure script's choices.
-+ACE_CXXFLAGS=""
-+ACE_CFLAGS=""
-+
-+ACE_SET_COMPILER_FLAGS
-+
-+dnl Disable building of static libraries by default
-+AC_DISABLE_STATIC
-+
-+dnl Enable Libtool module support
-+AC_LIBTOOL_DLOPEN
-+
-+dnl Enable support for "clean" DLLs.
-+AC_LIBTOOL_WIN32_DLL
-+
-+dnl Check for libtool and turn on Automake processing for Libtool
-+AC_PROG_LIBTOOL
-+
-+CXXFLAGS="$ACE_CXXFLAGS $X_CFLAGS $CXXFLAGS"
-+CFLAGS="$ACE_CFLAGS $X_CFLAGS $CFLAGS"
-+CPPFLAGS="$ACE_CPPFLAGS $CPPFLAGS"
-+LDFLAGS="$ACE_LDFLAGS $LDFLAGS"
- 
- dnl
- dnl SECTION 16: AC_CONFIG_FILES([FILE...])
diff --git a/debianbuild/patches/15-fix-fltk-include.dpatch b/debianbuild/patches/15-fix-fltk-include.dpatch
deleted file mode 100644
index 54dc8b6c348..00000000000
--- a/debianbuild/patches/15-fix-fltk-include.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 15-fix-fltk-include.dpatch by Raphael Bossek <bossekr@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Uses new FLTK header files.
-
-@DPATCH@
-
---- ACE_wrappers/ace/FlReactor/FlReactor.cpp.orig	2004-10-25 00:08:59.932411424 +0200
-+++ ACE_wrappers/ace/FlReactor/FlReactor.cpp	2004-10-25 00:09:08.272143592 +0200
-@@ -6,7 +6,7 @@
- 
- #if defined (ACE_HAS_FL)
- 
--#include /**/ <FL/Fl.h>
-+#include /**/ <FL/Fl.H>
- 
- ACE_ALLOC_HOOK_DEFINE (ACE_FlReactor)
- 
diff --git a/debianbuild/patches/17-protect-mpc-path.dpatch b/debianbuild/patches/17-protect-mpc-path.dpatch
deleted file mode 100644
index fb4ad963bfe..00000000000
--- a/debianbuild/patches/17-protect-mpc-path.dpatch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 17-protect-mpc-path.dpatch by Thomas Girard <thomas.g.girard@free.fr>
-##
-## DP: disable pattern metacharacters in path
-
-@DPATCH@
---- ACE_wrappers.orig/MPC/modules/AutomakeWorkspaceCreator.pm
-+++ ACE_wrappers/MPC/modules/AutomakeWorkspaceCreator.pm
-@@ -618,7 +618,7 @@
-   my($start) = $self->getstartdir();
- 
-   ## Take off the starting directory
--  $value =~ s/$start//;
-+  $value =~ s/\Q$start\E//;
-   return $value;
- }
- 
diff --git a/debianbuild/patches/20-fix-iostream-detection.dpatch b/debianbuild/patches/20-fix-iostream-detection.dpatch
deleted file mode 100644
index 4cd9e8cf059..00000000000
--- a/debianbuild/patches/20-fix-iostream-detection.dpatch
+++ /dev/null
@@ -1,128 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20-autoconf-fix-iostream.dpatch by Thomas Girard <thomas.g.girard@free.fr>
-##
-## DP: fix autotools iostream detection
-@DPATCH@
---- ACE_wrappers.orig/configure.ac
-+++ ACE_wrappers/configure.ac
-@@ -1013,11 +1013,9 @@
- dnl Check for availablity of "new style" C++ stream headers
- AC_CHECK_HEADERS([iomanip ios iostream istream ostream fstream streambuf],
-   ,
--  [AC_DEFINE([ACE_USES_OLD_IOSTREAMS])])
--
--AC_CHECK_HEADER([iostream.h],
--  [AC_CHECK_HEADER([fstream.h],,[AC_DEFINE([ACE_LACKS_IOSTREAM_TOTALLY])])],
--  [AC_DEFINE([ACE_LACKS_IOSTREAM_TOTALLY])])
-+  [AC_CHECK_HEADERS([iostream.h fstream.h],
-+                    [AC_DEFINE([ACE_USES_OLD_IOSTREAMS])],
-+                    [AC_DEFINE([ACE_LACKS_IOSTREAM_TOTALLY])])])
- 
- dnl Check if platform needs to #include <regexpr.h> for
- dnl regular expression support
-@@ -2014,14 +2012,18 @@
-   [ace_cv_feature_char_right_shifts],
-   [
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+#ifdef ACE_USES_OLD_IOSTREAM
- #include <iostream.h>
-+#else
-+#include <iostream>
-+#endif
-                   ]],[[
- unsigned char a = 0;
--cin >> a;
-+std::cin >> a;
- 
- #ifndef ACE_LACKS_SIGNED_CHAR
- signed char b = 0;
--cin >> b;
-+std::cin >> b;
- #endif
-                   ]])],[
-                    ace_cv_feature_char_right_shifts=yes
-@@ -2036,14 +2038,18 @@
-   [ace_cv_feature_char_ptr_right_shifts],
-   [
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+#ifdef ACE_USES_OLD_IOSTREAMS
- #include <iostream.h>
-+#else
-+#include <iostream>
-+#endif
-                   ]],[[
- unsigned char * a = 0;
--cin >> a;
-+std::cin >> a;
- 
- #ifndef ACE_LACKS_SIGNED_CHAR
- signed char * b = 0;
--cin >> b;
-+std::cin >> b;
- #endif
-                   ]])],[
-                    ace_cv_feature_char_ptr_right_shifts=yes
-@@ -5823,9 +5829,17 @@
- ACE_CACHE_CHECK([for iostream method ipfx()],
-   [ace_cv_feature_has_iostream_ipfx],[
-     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+#ifdef ACE_USES_OLD_IOSTREAMS
- #include <iostream.h>
-+#else
-+#include <iostream>
-+#endif
-       ]], [[
-+#ifdef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
-+       std::cin.ipfx();
-+#else
-        cin.ipfx();
-+#endif
-       ]])],[
-        ace_cv_feature_has_iostream_ipfx=yes
-       ],[
-@@ -5837,9 +5851,17 @@
- ACE_CACHE_CHECK([for line-buffered streambufs],
-   [ace_cv_feature_has_linebuffered_streambuf],[
-     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+#ifdef ACE_USES_OLD_IOSTREAMS
- #include <iostream.h>
-+#else
-+#include <iostream>
-+#endif
-       ]], [[
-+#ifdef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
-+       std::cin.rdbuf()->linebuffered(1);
-+#else
-        cin.rdbuf()->linebuffered(1);
-+#endif
-       ]])],[
-        ace_cv_feature_has_linebuffered_streambuf=yes
-       ],[
-@@ -5851,9 +5873,17 @@
- ACE_CACHE_CHECK([for unbuffered streambufs],
-   [ace_cv_feature_has_unbuffered_streambuf],[
-     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+#ifdef ACE_USES_OLD_IOSTREAMS
- #include <iostream.h>
-+#else
-+#include <iostream>
-+#endif
-       ]], [[
-+#ifdef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
-+       std::cin.rdbuf()->unbuffered(1);
-+#else
-        cin.rdbuf()->unbuffered(1);
-+#endif
-       ]])],[
-        ace_cv_feature_has_unbuffered_streambuf=yes
-       ],[
---- ACE_wrappers.orig/m4/aio.m4
-+++ ACE_wrappers/m4/aio.m4
-@@ -64,7 +64,6 @@
- #include <string.h>
- #include <errno.h>
- #include <stdio.h>
--#include <iostream.h>
- 
- #include <aio.h>
- 
diff --git a/debianbuild/patches/24-add-missing-headers.dpatch b/debianbuild/patches/24-add-missing-headers.dpatch
new file mode 100644
index 00000000000..96dfc8a0ad1
--- /dev/null
+++ b/debianbuild/patches/24-add-missing-headers.dpatch
@@ -0,0 +1,197 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 24-add-missing-headers.dpatch by Thomas Girard <thomas.g.girard@free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: adds missing headers
+
+@DPATCH@
+--- ACE_wrappers.orig/Kokyu/Kokyu.mpc
++++ ACE_wrappers/Kokyu/Kokyu.mpc
+@@ -14,8 +14,14 @@
+     Kokyu_defs.cpp
+   }
+ 
++  Header_Files {
++    kokyu_config.h
++    kokyu_export.h
++  }
++
+   Template_Files {
+     Kokyu_dsrt.cpp
++    DSRT_CV_Dispatcher_Impl_T.cpp
+     DSRT_Direct_Dispatcher_Impl_T.cpp
+     DSRT_Dispatcher_Impl_T.cpp
+     DSRT_Dispatch_Item_T.cpp
+--- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
++++ ACE_wrappers/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
+@@ -84,6 +84,13 @@
+     Event/EC_Thread_Flags.cpp
+   }
+ 
++  Header_Files {
++    Event/event_serv_export.h
++    Event/EC_Defaults.h
++    Event/ECG_Defaults.h
++    Event/ECG_Address_Server_Base.h
++  }
++
+   Template_Files {
+     Event/EC_Busy_Lock.cpp
+     Event/EC_Lifetime_Utils_T.cpp
+--- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
++++ ACE_wrappers/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
+@@ -17,6 +17,7 @@
+   }
+ 
+   Header_Files {
++    Event/rtcorba_event_export.h
+   }
+ 
+   Inline_Files {
+--- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
++++ ACE_wrappers/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
+@@ -19,6 +19,10 @@
+     }
+   }
+ 
++  Header_Files {
++    Event/rtkokyu_event_export.h
++  }
++
+   Template_Files {
+   }
+ }
+--- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
++++ ACE_wrappers/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
+@@ -20,6 +20,10 @@
+     }
+   }
+ 
++  Header_Files {
++    Event/sched_event_export.h
++  }
++
+   Template_Files {
+   }
+ }
+--- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/RTEvent.mpc
++++ ACE_wrappers/TAO/orbsvcs/orbsvcs/RTEvent.mpc
+@@ -26,6 +26,7 @@
+ 
+   Header_Files {
+     Event_Utilities.h
++    Event_Service_Constants.h
+     RtecDefaultEventDataC.h
+     RtecEventCommC.h
+     RtecEventChannelAdminC.h
+--- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/FTORB.mpc
++++ ACE_wrappers/TAO/orbsvcs/orbsvcs/FTORB.mpc
+@@ -22,6 +22,9 @@
+ 
+   Header_Files {
+     FaultTolerance/FT_ORB_Utils_export.h
++    FaultTolerance/FT_ORBInitializer.h
++    FaultTolerance/ftconf.h
++    FaultTolerance/FT_Service_Activate.h
+   }
+ 
+   Pkgconfig_Files {
+@@ -53,6 +56,10 @@
+     }
+   }
+ 
++  Header_Files {
++    FaultTolerance/FT_ClientORB_export.h
++  }
++
+   Template_Files {
+   }
+ 
+@@ -80,6 +87,10 @@
+     }
+   }
+ 
++  Header_Files {
++    FaultTolerance/FT_ServerORB_export.h
++  }
++
+   Template_Files {
+   }
+ 
+--- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
++++ ACE_wrappers/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
+@@ -32,6 +32,11 @@
+     }
+   }
+ 
++  Header_Files {
++    FtRtEvent/Utils/ScopeGuard.h
++    FtRtEvent/Utils/ftrtevent_export.h
++  }
++
+   Template_Files {
+   }
+ }
+@@ -50,6 +55,10 @@
+     }
+   }
+ 
++  Header_Files {
++    FtRtEvent/ClientORB/ftrt_clientorb_export.h
++  }
++
+   Inline_Files {
+   }
+ 
+@@ -79,5 +88,8 @@
+ 
+   Header_Files {
+     FtRtEvent/EventChannel/ftrtec_export.h
++    FtRtEvent/EventChannel/FTEC_Fault_Listener.h
++    FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h
++    FtRtEvent/EventChannel/Fault_Listener.h
+   }
+ }
+--- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/HTIOP.mpc
++++ ACE_wrappers/TAO/orbsvcs/orbsvcs/HTIOP.mpc
+@@ -26,4 +26,8 @@
+       HTIOP
+     }
+   }
++
++  Header_Files {
++    HTIOP/HTIOP_Export.h
++  }
+ }
+--- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
++++ ACE_wrappers/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
+@@ -41,6 +41,16 @@
+     }
+   }
+ 
++  Header_Files {
++    LoadBalancing/LB_LoadAlertMap.h
++    LoadBalancing/LB_LoadListMap.h
++    LoadBalancing/LB_LoadMap.h
++    LoadBalancing/LB_Location_Index_Map.h
++    LoadBalancing/LB_MonitorMap.h
++    LoadBalancing/LB_conf.h
++    LoadBalancing/LoadBalancing_export.h
++  }
++
+   Template_Files {
+   }
+ 
+--- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
++++ ACE_wrappers/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
+@@ -23,6 +23,10 @@
+     }
+   }
+ 
++  Header_Files {
++    LifeCycle/lifecycle_export.h
++  }
++
+   Template_Files {
+   }
+ 
diff --git a/debianbuild/patches/34-bts386713.dpatch b/debianbuild/patches/34-bts386713.dpatch
index cdf73439591..e7106d58adf 100644
--- a/debianbuild/patches/34-bts386713.dpatch
+++ b/debianbuild/patches/34-bts386713.dpatch
@@ -1,165 +1,445 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 34-bts386713.dpatch by Thomas Girard <thomas.g.girard@free.fr>
+## 34-bts386713.dpatch by Pau Garcia i Quiles <pgquiles@elpauer.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: load libraries with their complete name.
+## DP: load libraries with their complete name
 
 @DPATCH@
---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp	2007-01-25 18:04:11.000000000 +0000
-+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp	2007-02-13 11:45:38.000000000 +0000
-@@ -14,7 +14,7 @@
+diff -rupd ACE_wrappers.orig/TAO/CIAO/DAnCE/Starter/Starter.cpp ACE_wrappers/TAO/CIAO/DAnCE/Starter/Starter.cpp
+--- ACE_wrappers.orig/TAO/CIAO/DAnCE/Starter/Starter.cpp	2009-12-14 00:42:19.502255634 +0100
++++ ACE_wrappers/TAO/CIAO/DAnCE/Starter/Starter.cpp	2009-12-14 00:59:12.215257079 +0100
+@@ -562,7 +562,7 @@ Starter::initNodeManager (const char * n
+     if (0 == loader)
+       {
+         ACE_Service_Config::process_directive (ACE_DYNAMIC_SERVICE_DIRECTIVE ("NodeManager_Loader",
+-                                                                              "DAnCE_NodeManager",
++                                                                              "libDAnCE_NodeManager-0.7.5.so",
+                                                                               "_make_DAnCE_NodeManager_Module",
+                                                                               ""));
+         loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance ("NodeManager_Loader");
+@@ -592,7 +592,7 @@ Starter::initExecutionManager()
+     DANCE_DEBUG ( (LM_TRACE, "[%M] Starting ExecutionManager...\n"));
+     ACE_Service_Config::process_directive (
+         ACE_DYNAMIC_SERVICE_DIRECTIVE ("ExecutionManager_Loader"
+-            , "DAnCE_ExecutionManager"
++            , "libDAnCE_ExecutionManager-0.7.5.so"
+             , "_make_DAnCE_ExecutionManager_Module"
+             , ""));
+     TAO_Object_Loader * loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance ("ExecutionManager_Loader");
+@@ -623,7 +623,7 @@ Starter::runPlanLauncher()
+         DANCE_DEBUG ( (LM_TRACE, "[%M] Starting PlanLauncher...\n"));
+         ACE_Service_Config::process_directive (
+             ACE_DYNAMIC_SERVICE_DIRECTIVE ("PlanLauncher_Loader"
+-                , "DAnCE_Plan_Launcher"
++                , "libDAnCE_Plan_Launcher-0.7.5.so"
+                 , "_make_DAnCE_Plan_Launcher_Module"
+                 , ""));
+       }
+@@ -632,7 +632,7 @@ Starter::runPlanLauncher()
+         DANCE_DEBUG ( (LM_TRACE, "[%M] Starting PlanLauncherBase...\n"));
+         ACE_Service_Config::process_directive (
+             ACE_DYNAMIC_SERVICE_DIRECTIVE ("PlanLauncher_Loader"
+-                , "DAnCE_Plan_Launcher_Base"
++                , "libDAnCE_Plan_Launcher_Base-0.7.5.so"
+                 , "_make_DAnCE_Plan_Launcher_Base_Module"
+                 , ""));
+       }
+diff -rupd ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp ACE_wrappers/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
+--- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp	2009-12-14 00:42:05.534162607 +0100
++++ ACE_wrappers/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp	2009-12-14 00:59:12.215257079 +0100
+@@ -14,7 +14,7 @@ ACE_RCSID (PortableGroup,
  
  static const char pg_poa_factory_name[] = "TAO_GOA";
- static const char pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ static const ACE_TCHAR pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
 -  "TAO_GOA", "TAO_PortableGroup", "_make_TAO_PG_Object_Adapter_Factory", "");
-+  "TAO_GOA", "libTAO_PortableGroup-1.6.6.so", "_make_TAO_PG_Object_Adapter_Factory", "");
++  "TAO_GOA", "libTAO_PortableGroup-1.7.5.so", "_make_TAO_PG_Object_Adapter_Factory", "");
  
  TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  
---- ACE_wrappers.orig/TAO/tao/ORB_Core.cpp	2007-01-25 19:59:59.000000000 +0000
-+++ ACE_wrappers/TAO/tao/ORB_Core.cpp	2007-02-13 12:33:58.000000000 +0000
-@@ -1596,7 +1596,7 @@
+diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp
+--- ACE_wrappers.orig/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp	2009-12-14 00:42:06.382162746 +0100
++++ ACE_wrappers/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp	2009-12-14 00:59:12.215257079 +0100
+@@ -18,7 +18,7 @@ ACE_TCHAR const * const scpc_unloadOrb =
+ 
+ ACE_TCHAR const * const scpc_loadNamingService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+   "testNamingService",
+-  "TAO_CosNaming_Serv",
++  "libTAO_CosNaming_Serv-1.7.5.so",
+   "_make_TAO_Naming_Loader",
+   ""
+ );
+diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
+--- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp	2009-12-14 00:42:06.030162565 +0100
++++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp	2009-12-14 00:59:12.215257079 +0100
+@@ -20,7 +20,7 @@ ACE_TCHAR const * const scpc_unloadOrb =
+ 
+ ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+   "testNotifyService",
+-  "TAO_CosNotification_Serv",
++  "libTAO_CosNotification_Serv-1.7.5.so",
+   "_make_TAO_CosNotify_Service",
+   ""
+ );
+diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
+--- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp	2009-12-14 00:42:06.026162764 +0100
++++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp	2009-12-14 00:59:12.215257079 +0100
+@@ -24,7 +24,7 @@ ACE_TCHAR const * const scpc_unloadOrb =
+ 
+ ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+   "testNotifyService",
+-  "TAO_CosNotification_Serv",
++  "libTAO_CosNotification_Serv-1.7.5.so",
+   "_make_TAO_CosNotify_Service",
+   "-UseSeparateDispatchingORB 1"
+ );
+diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
+--- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp	2009-12-14 00:42:06.018162604 +0100
++++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp	2009-12-14 00:59:12.219164079 +0100
+@@ -20,7 +20,7 @@ ACE_TCHAR const * const scpc_unloadOrb =
+ 
+ ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+   "testNotifyService",
+-  "TAO_Notify_Service",
++  "libTAO_Notify_Service-1.7.5.so",
+   "_make_TAO_Notify_Service_Driver",
+   "-NoNameSvc -RunThreads 0"
+ );
+diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
+--- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp	2009-12-14 00:42:06.046162766 +0100
++++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp	2009-12-14 00:59:12.219164079 +0100
+@@ -23,7 +23,7 @@ ACE_TCHAR const * const scpc_unloadOrb =
+ 
+ ACE_TCHAR scpc_loadNotifyService[max_length] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+   "testNotifyService",
+-  "TAO_Notify_Service",
++  "libTAO_Notify_Service-1.7.5.so",
+   "_make_TAO_Notify_Service_Driver",
+   "-Channel -ChannelName Channel1 -ChannelName Channel2 -RunThreads 0 -ORBInitRef NameService=iioploc://%s:%s/NameService -IORoutput %s"
+ );
+diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
+--- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp	2009-12-14 00:42:06.074162491 +0100
++++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp	2009-12-14 00:59:12.219164079 +0100
+@@ -20,7 +20,7 @@ ACE_TCHAR const * const scpc_unloadOrb =
+ 
+ ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+   "testNotifyService",
+-  "TAO_Notify_Service",
++  "libTAO_Notify_Service-1.7.5.so",
+   "_make_TAO_Notify_Service_Driver",
+   "-Channel -ChannelName Channel1 -ChannelName Channel2 -RunThreads 10 -ORBInitRef NameService=file://naming.ior -IORoutput notify.ior"
+ );
+@@ -29,7 +29,7 @@ ACE_TCHAR const * const scpc_unloadNotif
+ 
+ ACE_TCHAR const * const scpc_loadNameService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+   "testNamingService",
+-  "TAO_CosNaming_Serv",
++  "libTAO_CosNaming_Serv-1.7.5.so",
+   "_make_TAO_Naming_Loader",
+   "testNameService testNameService -ORBId testDllOrb -m 0 -o naming.ior"
+ );
+diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
+--- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp	2009-12-14 00:42:06.038162926 +0100
++++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp	2009-12-14 00:59:12.219164079 +0100
+@@ -20,7 +20,7 @@ ACE_TCHAR const * const scpc_unloadOrb =
+ 
+ ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+   "testNotifyService",
+-  "TAO_Notify_Service",
++  "libTAO_Notify_Service-1.7.5.so",
+   "_make_TAO_Notify_Service_Driver_INCORRECT",
+   "-NoNameSvc -RunThreads 0"
+ );
+diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
+--- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp	2009-12-14 00:42:06.062163609 +0100
++++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp	2009-12-14 00:59:12.219164079 +0100
+@@ -24,7 +24,7 @@ ACE_TCHAR const * const scpc_unloadOrb =
+ 
+ ACE_TCHAR const * const scpc_loadNameService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+   "testNamingService",
+-  "TAO_CosNaming_Serv",
++  "libTAO_CosNaming_Serv-1.7.5.so",
+   "_make_TAO_Naming_Loader",
+   "testNameService testNameService -ORBId testDllOrb -m 0 -o naming.ior"
+ );
+@@ -34,7 +34,7 @@ ACE_TCHAR const * const scpc_unloadNameS
+ 
+ ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+   "testNotifyService",
+-  "TAO_Notify_Service",
++  "libTAO_Notify_Service-1.7.5.so",
+   "_make_TAO_Notify_Service_Driver",
+   "-Channel -ChannelName Channel1 -ChannelName Channel2 -RunThreads 1 -ORBInitRef NameService=file://naming.ior -IORoutput notify.ior"
+ );
+diff -rupd ACE_wrappers.orig/TAO/tao/Codeset/Codeset_Manager_i.cpp ACE_wrappers/TAO/tao/Codeset/Codeset_Manager_i.cpp
+--- ACE_wrappers.orig/TAO/tao/Codeset/Codeset_Manager_i.cpp	2009-12-14 00:42:09.538164079 +0100
++++ ACE_wrappers/TAO/tao/Codeset/Codeset_Manager_i.cpp	2009-12-14 00:59:12.219164079 +0100
+@@ -358,7 +358,7 @@ TAO_Codeset_Manager_i::open(TAO_ORB_Core
+   if (fact == 0)
+     ACE_Service_Config::process_directive
+       (ACE_DYNAMIC_SERVICE_DIRECTIVE ("UTF8_Latin1_Factory",
+-                                      "TAO_Codeset",
++                                      "libTAO_Codeset-1.7.5.so",
+                                       "_make_TAO_UTF8_Latin1_Factory",
+                                       ""));
+   else
+@@ -375,7 +375,7 @@ TAO_Codeset_Manager_i::open(TAO_ORB_Core
+   if (fact == 0)
+     ACE_Service_Config::process_directive
+       (ACE_DYNAMIC_SERVICE_DIRECTIVE ("UTF16_BOM_Factory",
+-                                      "TAO_Codeset",
++                                      "libTAO_Codeset-1.7.5.so",
+                                       "_make_TAO_UTF16_BOM_Factory",
+                                       ""));
+   else
+diff -rupd ACE_wrappers.orig/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp ACE_wrappers/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
+--- ACE_wrappers.orig/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp	2009-12-14 00:42:09.426163271 +0100
++++ ACE_wrappers/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp	2009-12-14 00:59:12.219164079 +0100
+@@ -13,7 +13,7 @@ ACE_RCSID (CSD,
+ static const ACE_TCHAR csd_poa_factory_directive[] =
+   ACE_DYNAMIC_SERVICE_DIRECTIVE(
+     "TAO_CSD_Object_Adapter_Factory",
+-    "TAO_CSD_Framework",
++    "libTAO_CSD_Framework-1.7.5.so",
+     "_make_TAO_CSD_Object_Adapter_Factory",
+     "");
+ 
+diff -rupd ACE_wrappers.orig/TAO/tao/ORB_Core.cpp ACE_wrappers/TAO/tao/ORB_Core.cpp
+--- ACE_wrappers.orig/TAO/tao/ORB_Core.cpp	2009-12-14 00:42:09.538164079 +0100
++++ ACE_wrappers/TAO/tao/ORB_Core.cpp	2009-12-14 00:59:12.219164079 +0100
+@@ -1643,7 +1643,7 @@ TAO_ORB_Core::policy_factory_registry_i 
      {
        this->configuration ()->process_directive (
          ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader",
 -                                      "TAO_PI",
-+                                      "libTAO_PI-1.6.6.so",
++                                      "libTAO_PI-1.7.5.so",
                                        "_make_TAO_PolicyFactory_Loader",
                                        ""));
        loader =
-@@ -1635,7 +1635,7 @@
+@@ -1695,7 +1695,7 @@ TAO_ORB_Core::orbinitializer_registry_i 
      {
-       config->process_directive (
+       this->configuration ()->process_directive (
          ACE_DYNAMIC_SERVICE_DIRECTIVE ("ORBInitializer_Registry",
 -                                       "TAO_PI",
-+                                       "libTAO_PI-1.6.6.so",
++                                       "libTAO_PI-1.7.5.so",
                                         "_make_ORBInitializer_Registry",
                                         ""));
        this->orbinitializer_registry_ =
-@@ -2432,7 +2432,7 @@
+@@ -2429,7 +2429,7 @@ TAO_ORB_Core::resolve_typecodefactory_i 
      {
        this->configuration ()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("TypeCodeFactory",
 -                                       "TAO_TypeCodeFactory",
-+                                       "libTAO_TypeCodeFactory-1.6.6.so",
++                                       "libTAO_TypeCodeFactory-1.7.5.so",
                                         "_make_TAO_TypeCodeFactory_Loader",
                                         ""));
        loader =
-@@ -2465,7 +2465,7 @@
+@@ -2462,7 +2462,7 @@ TAO_ORB_Core::resolve_codecfactory_i (vo
      {
        this->configuration()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory",
 -                                       "TAO_CodecFactory",
-+                                       "libTAO_CodecFactory-1.6.6.so",
++                                       "libTAO_CodecFactory-1.7.5.so",
                                         "_make_TAO_CodecFactory_Loader",
                                         ""));
        loader =
-@@ -2492,7 +2492,7 @@
+@@ -2489,7 +2489,7 @@ TAO_ORB_Core::resolve_compression_manage
      {
        this->configuration()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("Compression",
 -                                       "TAO_Compression",
-+                                       "libTAO_Compression-1.6.6.so",
++                                       "libTAO_Compression-1.7.5.so",
                                         "_make_TAO_Compression_Loader",
                                         ""));
        loader =
-@@ -2519,7 +2519,7 @@
+@@ -2515,7 +2515,7 @@ TAO_ORB_Core::resolve_poa_current_i (voi
      {
        this->configuration()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_POA_Current_Factory",
 -                                       "TAO_PortableServer",
-+                                       "libTAO_PortableServer-1.6.6.so",
++                                       "libTAO_PortableServer-1.7.5.so",
                                         "_make_TAO_POA_Current_Factory",
                                         ""));
        loader =
-@@ -2549,7 +2549,7 @@
+@@ -2544,7 +2544,7 @@ TAO_ORB_Core::resolve_picurrent_i (void)
      {
        this->configuration ()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("PICurrent_Loader",
 -                                       "TAO_PI",
-+                                       "libTAO_PI-1.6.6.so",
++                                       "libTAO_PI-1.7.5.so",
                                         "_make_TAO_PICurrent_Loader",
                                         ""));
        loader =
-@@ -2581,7 +2581,7 @@
+@@ -2575,7 +2575,7 @@ TAO_ORB_Core::resolve_dynanyfactory_i (v
      {
        this->configuration ()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("DynamicAny_Loader",
 -                                       "TAO_DynamicAny",
-+                                       "libTAO_DynamicAny-1.6.6.so",
++                                       "libTAO_DynamicAny-1.7.5.so",
                                         "_make_TAO_DynamicAny_Loader",
                                         ""));
        loader =
-@@ -2609,7 +2609,7 @@
+@@ -2602,7 +2602,7 @@ TAO_ORB_Core::resolve_iormanipulation_i 
      {
        this->configuration()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("IORManip_Loader",
 -                                       "TAO_IORManip",
-+                                       "libTAO_IORManip-1.6.6.so",
++                                       "libTAO_IORManip-1.7.5.so",
                                         "_make_TAO_IORManip_Loader",
                                         ""));
        loader =
-@@ -2636,7 +2636,7 @@
+@@ -2628,7 +2628,7 @@ TAO_ORB_Core::resolve_ior_table_i (void)
      {
        this->configuration ()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_IORTable",
 -                                       "TAO_IORTable",
-+                                       "libTAO_IORTable-1.6.6.so",
++                                       "libTAO_IORTable-1.7.5.so",
                                         "_make_TAO_Table_Adapter_Factory",
                                         ""));
        factory =
---- ACE_wrappers.orig/TAO/tao/ORBInitializer_Registry.cpp	2007-01-24 16:37:36.000000000 +0000
-+++ ACE_wrappers/TAO/tao/ORBInitializer_Registry.cpp	2007-02-13 12:30:53.000000000 +0000
-@@ -57,7 +57,7 @@
+@@ -2663,7 +2663,7 @@ TAO_ORB_Core::resolve_monitor_i (void)
+     {
+       this->configuration ()->process_directive
+         (ACE_DYNAMIC_SERVICE_DIRECTIVE("Monitor_Init",
+-                                       "TAO_Monitor",
++                                       "libTAO_Monitor-1.7.5.so",
+                                        "_make_TAO_Monitor_Init",
+                                        ""));
+       loader =
+diff -rupd ACE_wrappers.orig/TAO/tao/ORBInitializer_Registry.cpp ACE_wrappers/TAO/tao/ORBInitializer_Registry.cpp
+--- ACE_wrappers.orig/TAO/tao/ORBInitializer_Registry.cpp	2009-12-14 00:42:09.662163328 +0100
++++ ACE_wrappers/TAO/tao/ORBInitializer_Registry.cpp	2009-12-14 00:59:12.219164079 +0100
+@@ -53,7 +53,7 @@ namespace PortableInterceptor
        {
          ACE_Service_Config::process_directive (
            ACE_DYNAMIC_SERVICE_DIRECTIVE("ORBInitializer_Registry",
 -                                        "TAO_PI",
-+                                        "libTAO_PI-1.6.6.so",
++                                        "libTAO_PI-1.7.5.so",
                                          "_make_ORBInitializer_Registry",
                                          ""));
          orbinitializer_registry_ =
---- ACE_wrappers.orig/TAO/tao/PI/ORBInitInfo.cpp	2007-01-24 18:43:15.000000000 +0000
-+++ ACE_wrappers/TAO/tao/PI/ORBInitInfo.cpp	2007-02-13 12:30:07.000000000 +0000
-@@ -128,7 +128,7 @@
+diff -rupd ACE_wrappers.orig/TAO/tao/params.cpp ACE_wrappers/TAO/tao/params.cpp
+--- ACE_wrappers.orig/TAO/tao/params.cpp	2009-12-14 00:42:09.170163692 +0100
++++ ACE_wrappers/TAO/tao/params.cpp	2009-12-14 00:59:12.259162724 +0100
+@@ -59,7 +59,7 @@ TAO_ORB_Parameters::TAO_ORB_Parameters (
+   , poa_factory_name_ ("TAO_Object_Adapter_Factory")
+   , poa_factory_directive_
+       (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Object_Adapter_Factory",
+-                                     "TAO_PortableServer",
++                                     "libTAO_PortableServer-1.7.5.so",
+                                      "_make_TAO_Object_Adapter_Factory",
+                                      ""))
+   , forward_invocation_on_object_not_exist_ (false)
+diff -rupd ACE_wrappers.orig/TAO/tao/PI/ORBInitInfo.cpp ACE_wrappers/TAO/tao/PI/ORBInitInfo.cpp
+--- ACE_wrappers.orig/TAO/tao/PI/ORBInitInfo.cpp	2009-12-14 00:42:09.534163639 +0100
++++ ACE_wrappers/TAO/tao/PI/ORBInitInfo.cpp	2009-12-14 00:59:12.223163120 +0100
+@@ -121,7 +121,7 @@ TAO_ORBInitInfo::codec_factory (void)
          {
            ACE_Service_Config::process_directive (
              ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory",
 -                                          "TAO_CodecFactory",
-+                                          "libTAO_CodecFactory-1.6.6.so",
++                                          "libTAO_CodecFactory-1.7.5.so",
                                            "_make_TAO_CodecFactory_Loader",
                                            ""));
            loader =
---- ACE_wrappers.orig/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp	2007-01-24 16:37:36.000000000 +0000
-+++ ACE_wrappers/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp	2007-02-13 11:46:59.000000000 +0000
-@@ -85,7 +85,7 @@
+diff -rupd ACE_wrappers.orig/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp ACE_wrappers/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
+--- ACE_wrappers.orig/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp	2009-12-14 00:42:09.422163150 +0100
++++ ACE_wrappers/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp	2009-12-14 00:59:12.223163120 +0100
+@@ -83,7 +83,7 @@ namespace TAO
              {
                ACE_Service_Config::process_directive (
                  ACE_DYNAMIC_SERVICE_DIRECTIVE(
 -                  "ImR_Client_Adapter", "TAO_ImR_Client",
-+                  "ImR_Client_Adapter", "libTAO_ImR_Client-1.6.6.so",
++                  "ImR_Client_Adapter", "libTAO_ImR_Client-1.7.5.so",
                    "_make_ImR_Client_Adapter_Impl", ""));
  
                adapter =
---- ACE_wrappers.orig/TAO/tao/TAO_Internal.cpp	2006-12-28 11:46:39.000000000 +0000
-+++ ACE_wrappers/TAO/tao/TAO_Internal.cpp	2007-02-13 11:47:57.000000000 +0000
-@@ -484,7 +484,7 @@
+diff -rupd ACE_wrappers.orig/TAO/tao/RTCORBA/RT_ORBInitializer.cpp ACE_wrappers/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
+--- ACE_wrappers.orig/TAO/tao/RTCORBA/RT_ORBInitializer.cpp	2009-12-14 00:42:09.774162647 +0100
++++ ACE_wrappers/TAO/tao/RTCORBA/RT_ORBInitializer.cpp	2009-12-14 00:59:12.223163120 +0100
+@@ -41,7 +41,7 @@ static const char rt_poa_factory_name[] 
+ static const ACE_TCHAR rt_poa_factory_directive[] =
+   ACE_DYNAMIC_SERVICE_DIRECTIVE(
+     "TAO_RT_Object_Adapter_Factory",
+-    "TAO_RTPortableServer",
++    "libTAO_RTPortableServer-1.7.5.so",
+     "_make_TAO_RT_Object_Adapter_Factory",
+     "");
+ 
+diff -rupd ACE_wrappers.orig/TAO/tao/TAO_Internal.cpp ACE_wrappers/TAO/tao/TAO_Internal.cpp
+--- ACE_wrappers.orig/TAO/tao/TAO_Internal.cpp	2009-12-14 00:42:10.002163319 +0100
++++ ACE_wrappers/TAO/tao/TAO_Internal.cpp	2009-12-14 00:59:12.223163120 +0100
+@@ -534,7 +534,7 @@ namespace
              ACE_Service_Config::process_directive (
                ACE_DYNAMIC_SERVICE_DIRECTIVE (
                  "TAO_Codeset",
 -                "TAO_Codeset",
-+                "libTAO_Codeset-1.6.6.so",
++                "libTAO_Codeset-1.7.5.so",
                  "_make_TAO_Codeset_Manager_Factory",
                  ""));
  
---- ACE_wrappers.orig/TAO/tao/RTCORBA/RT_ORBInitializer.cpp	2007-06-28 18:53:33.000000000 +0000
-+++ ACE_wrappers/TAO/tao/RTCORBA/RT_ORBInitializer.cpp	2007-06-28 18:55:43.000000000 +0000
-@@ -40,7 +40,7 @@
- static const ACE_TCHAR rt_poa_factory_directive[] =
-   ACE_DYNAMIC_SERVICE_DIRECTIVE(
-     "TAO_RT_Object_Adapter_Factory",
--    "TAO_RTPortableServer",
-+    "libTAO_RTPortableServer-1.6.6.so",
-     "_make_TAO_RT_Object_Adapter_Factory",
-     "");
+diff -rupd ACE_wrappers.orig/TAO/tests/DLL_ORB/client.cpp ACE_wrappers/TAO/tests/DLL_ORB/client.cpp
+--- ACE_wrappers.orig/TAO/tests/DLL_ORB/client.cpp	2009-12-14 00:42:12.254247172 +0100
++++ ACE_wrappers/TAO/tests/DLL_ORB/client.cpp	2009-12-14 01:19:12.378162468 +0100
+@@ -30,7 +30,7 @@ ACE_TMAIN(int, ACE_TCHAR *[])
+   if (ACE_Service_Config::process_directive (
+         ACE_DYNAMIC_SERVICE_DIRECTIVE(
+           "Client_Module",
+-          "Test_Client_Module",
++          "libTest_Client_Module-1.7.5.so",
+           "_make_Test_Client_Module",
+           "-k file://test.ior")) != 0)
+     {
+diff -rupd ACE_wrappers.orig/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp ACE_wrappers/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp
+--- ACE_wrappers.orig/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp	2009-12-14 00:42:13.546163086 +0100
++++ ACE_wrappers/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp	2009-12-14 01:26:03.054181888 +0100
+@@ -13,7 +13,7 @@ ACE_TCHAR const * const scpc_loadOrb = /
+   // each parameter CANNOT be split into multiple quoted strings "line1" "nextline" with the expectation that
+   // they will be join together. Hence the long parameter 4.
+   ACE_DYNAMIC_SERVICE_DIRECTIVE ("testDllOrb",
+-                                 "DllOrb",
++                                 "DllOrb.so",
+                                  "_make_DllOrb",
+ "DllOrb -t 1 -ORBGestalt Local -ORBDebugLevel 3 -ORBId testORB -ORBInitRef NameService=file:///tmp/test-ns.ior -ORBDottedDecimalAddresses 1"
+                                  );
+diff -rupd ACE_wrappers.orig/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp ACE_wrappers/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
+--- ACE_wrappers.orig/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp	2009-12-14 00:42:13.650166654 +0100
++++ ACE_wrappers/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp	2009-12-14 00:59:12.259162724 +0100
+@@ -153,7 +153,7 @@ testORBInitializer_Registry (int , ACE_T
+     {
+       one->process_directive (
+         ACE_DYNAMIC_SERVICE_DIRECTIVE("ORBInitializer_Registry",
+-                                      "TAO_PI",
++                                      "libTAO_PI-1.7.5.so",
+                                       "_make_ORBInitializer_Registry",
+                                       ""));
+       oir =
+@@ -252,7 +252,7 @@ testORBInitializer_Registry (int , ACE_T
+ 
+   one->process_directive
+     (ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader",
+-                                   "TAO_PI",
++                                   "libTAO_PI-1.7.5.so",
+                                    "_make_TAO_PolicyFactory_Loader",
+                                    ""));
+ 
+@@ -292,7 +292,7 @@ testServiceDependency (int , ACE_TCHAR *
  
+     int result = one->process_directive
+       (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Codeset",
+-                                     "TAO_Codeset",
++                                     "libTAO_Codeset-1.7.5.so",
+                                      "_make_TAO_Codeset_Manager_Factory",
+                                      ""));
+     if (result != 0)
+diff -rupd ACE_wrappers.orig/TAO/tests/TransportCurrent/Framework/simple.cpp ACE_wrappers/TAO/tests/TransportCurrent/Framework/simple.cpp
+--- ACE_wrappers.orig/TAO/tests/TransportCurrent/Framework/simple.cpp	2009-12-14 00:42:10.274245769 +0100
++++ ACE_wrappers/TAO/tests/TransportCurrent/Framework/simple.cpp	2009-12-14 00:59:12.259162724 +0100
+@@ -59,7 +59,7 @@ testCurrentLoader (int, char *[])
+ #if !defined (TAO_AS_STATIC_LIBS)
+           int ret = ACE_Service_Config::process_directive
+             (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Transport_Current_Loader",
+-                                           "TAO_Transport_Current",
++                                           "libTAO_Transport_Current-1.7.5.so",
+                                            "_make_TAO_Transport_Current_Loader",
+                                            ""));
+           ACE_ASSERT (ret == 0);
diff --git a/debianbuild/patches/90-patch-mpc-basedir.dpatch b/debianbuild/patches/90-patch-mpc-basedir.dpatch
new file mode 100644
index 00000000000..594844a615b
--- /dev/null
+++ b/debianbuild/patches/90-patch-mpc-basedir.dpatch
@@ -0,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90-patch-mpc-basedir.dpatch by  <pgquiles@elpauer.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Set MPC base dir directly, no need to fix the tests performed by ACE 
+## DP: because there is no Debian/VMS (yeat :-)
+
+@DPATCH@
+
+diff -rupd ACE_wrappers.orig/bin/mpc.pl ACE_wrappers/bin/mpc.pl
+--- ACE_wrappers.orig/bin/mpc.pl	2009-11-23 01:19:57.000000000 +0100
++++ ACE_wrappers/bin/mpc.pl	2009-11-24 00:24:27.000000000 +0100
+@@ -20,13 +20,7 @@ use FindBin;
+ use File::Spec;
+ use File::Basename;
+ 
+-my($basePath) = $FindBin::RealBin;
+-my($baseName) = $FindBin::RealScript;
+-if ($^O eq 'VMS') {
+-  $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq '');
+-  $basePath = VMS::Filespec::unixify($basePath);
+-}
+-$basePath .= '/MakeProjectCreator';
++my($basePath) = '/usr/share/ace/bin/MakeProjectCreator';
+ 
+ my($mpcroot) = $ENV{MPC_ROOT};
+ my($mpcpath) = (defined $mpcroot ? $mpcroot :
+diff -rupd ACE_wrappers.orig/bin/mwc.pl ACE_wrappers/bin/mwc.pl
+--- ACE_wrappers.orig/bin/mwc.pl	2009-11-23 01:19:57.000000000 +0100
++++ ACE_wrappers/bin/mwc.pl	2009-11-24 00:23:44.000000000 +0100
+@@ -20,13 +20,7 @@ use FindBin;
+ use File::Spec;
+ use File::Basename;
+ 
+-my($basePath) = $FindBin::RealBin;
+-my($baseName) = $FindBin::RealScript;
+-if ($^O eq 'VMS') {
+-  $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq '');
+-  $basePath = VMS::Filespec::unixify($basePath);
+-}
+-$basePath .= '/MakeProjectCreator';
++my($basePath) = '/usr/share/ace/bin/MakeProjectCreator';
+ 
+ my($mpcroot) = $ENV{MPC_ROOT};
+ my($mpcpath) = (defined $mpcroot ? $mpcroot :
diff --git a/debianbuild/patches/91-patch-dg-basedir.dpatch b/debianbuild/patches/91-patch-dg-basedir.dpatch
new file mode 100644
index 00000000000..0703e3e6a38
--- /dev/null
+++ b/debianbuild/patches/91-patch-dg-basedir.dpatch
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 91-patch-dg-basedir.dpatch by Thomas Girard <thomas.g.girard@free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix path to DependencyGenerator.
+
+@DPATCH@
+--- ACE_wrappers.orig/bin/depgen.pl
++++ ACE_wrappers/bin/depgen.pl
+@@ -19,12 +19,8 @@
+ use File::Spec;
+ use File::Basename;
+ 
+-my($basePath) = $FindBin::RealBin;
+-if ($^O eq 'VMS') {
+-  $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq '');
+-  $basePath = VMS::Filespec::unixify($basePath);
+-}
+-unshift(@INC, $basePath . '/DependencyGenerator');
++my($basePath) = '/usr/share/ace/bin/DependencyGenerator';
++unshift(@INC, $basePath);
+ 
+ require DependencyEditor;
+ 
diff --git a/debianbuild/patches/95-build-ace-for-tao.dpatch b/debianbuild/patches/95-build-ace-for-tao.dpatch
new file mode 100644
index 00000000000..61c3261dce7
--- /dev/null
+++ b/debianbuild/patches/95-build-ace-for-tao.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 95-build-ace-for-tao.dpatch by  <pgquiles@elpauer.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Always define nobase_include_HEADERS, regardless of BUILD_ACE_FOR_TAO
+
+@DPATCH@
+
+diff -rupd ACE_wrappers.orig/ace/Makefile.am ACE_wrappers/ace/Makefile.am
+--- ACE_wrappers.orig/ace/Makefile.am	2009-11-05 22:47:49.000000000 +0100
++++ ACE_wrappers/ace/Makefile.am	2009-11-06 00:35:29.000000000 +0100
+@@ -27,7 +27,7 @@ nobase_include_HEADERS =
+ 
+ ## Makefile.ACE.am
+ 
+-if !BUILD_ACE_FOR_TAO
++## if !BUILD_ACE_FOR_TAO
+ 
+ lib_LTLIBRARIES += libACE.la
+ 
+@@ -1261,7 +1261,7 @@ CLEANFILES += \
+ ACE.pc: ${top_builddir}/config.status ${srcdir}/ACE.pc.in
+ 	${top_builddir}/config.status --file $@:${srcdir}/ACE.pc.in
+ 
+-endif !BUILD_ACE_FOR_TAO
++## endif !BUILD_ACE_FOR_TAO
+ 
+ EXTRA_DIST = \
+   ACE.pc.in \
diff --git a/debianbuild/rules b/debianbuild/rules
index a3650fa1d82..5602c1aed85 100644
--- a/debianbuild/rules
+++ b/debianbuild/rules
@@ -52,7 +52,6 @@ export ACE_ROOT := $(shell pwd)/$(ACE_SUBDIR)
 export TAO_ROOT := $(ACE_ROOT)/TAO
 export CIAO_ROOT := $(TAO_ROOT)/CIAO
 export DANCE_ROOT := $(CIAO_ROOT)/DAnCE
-export DDS_ROOT := $(CIAO_ROOT)/connectors/dds4ccm
 export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(ACE_ROOT)/lib
 export QTDIR := /usr/share/qt4
 
@@ -195,13 +194,6 @@ install: build
 	$(MAKE) -C objdir install DESTDIR=$(CURDIR)/$(DT)
 	$(MAKE) -C objdir/TAO install DESTDIR=$(CURDIR)/$(DT)
 
-#	Rename the catior utility, it already exists in another package
-	mv $(DT)/usr/bin/catior $(DT)/usr/bin/tao-catior
-
-#       Multiple README
-	cp $(TAO_ROOT)/utils/catior/README $(TAO_ROOT)/utils/catior/README.catior
-	cp $(TAO_ROOT)/utils/nslist/README $(TAO_ROOT)/utils/nslist/README.nslist
-
 #	We provide scripts replacement for tao_idl and tao_ifr ; they
 #	automatically define ACE_ROOT and TAO_ROOT
 	mv $(DT)/usr/bin/tao_idl $(DT)/usr/bin/tao_idl.real
diff --git a/docs/Download.html b/docs/Download.html
index 0dcea8645ed..8c9bd0148df 100644
--- a/docs/Download.html
+++ b/docs/Download.html
@@ -84,101 +84,101 @@ of the ACE, TAO, and CIAO micro release kit is available for
   <TR><TH>Filename</TH><TH>Description</TH><TH>Full</TH><TH>Sources only</TH></TR>
   <TR><TD>ACE+TAO+CIAO.tar.gz</TD>
       <TD>ACE+TAO+CIAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.5.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.5.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.6.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.5.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.5.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.6.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO+CIAO.tar.bz2</TD>
       <TD>ACE+TAO+CIAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.5.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.5.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.6.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.5.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.5.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.6.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO+CIAO.zip</TD>
       <TD>ACE+TAO+CIAO (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.5.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.5.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.6.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.5.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.5.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.6.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO.tar.gz</TD>
       <TD>ACE+TAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.5.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.5.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.6.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.5.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.5.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.6.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO.tar.bz2</TD>
       <TD>ACE+TAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.5.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.5.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.6.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.5.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.5.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.6.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO.zip</TD>
       <TD>ACE+TAO (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.5.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.5.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.6.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.5.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.5.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.6.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.tar.gz</TD>
       <TD>Doxygen documentation for ACE+TAO+CIAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.5.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.5.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.6.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.tar.bz2</TD>
       <TD>Doxygen documentation for ACE+TAO+CIAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.5.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.5.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.6.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.zip</TD>
       <TD>Doxygen documentation for ACE+TAO+CIAO (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.5.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.5.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.6.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.tar.gz</TD>
       <TD>ACE only (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.5.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.5.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.6.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.5.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.5.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.6.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.tar.bz2</TD>
       <TD>ACE only (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.5.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.5.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.6.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.5.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.5.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.6.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.zip</TD>
       <TD>ACE only (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.5.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.5.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.6.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.5.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.5.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.6.zip">FTP</A>]
       </TD>
   </TR>
 </TABLE>
diff --git a/docs/bczar/bczar.html b/docs/bczar/bczar.html
index 5ae168db65e..60327564b29 100644
--- a/docs/bczar/bczar.html
+++ b/docs/bczar/bczar.html
@@ -202,6 +202,8 @@
         No default printer<br>
         -bash-3.00$ screen<br>
         -bash-3.00$ cd /export/anduriltmp/bczar<br>
+        -bash-3.00$ rm -rf DOC_ROOT<br>
+        -bash-3.00$ mkdir DOC_ROOT<br>
         -bash-3.00$ export DOC_ROOT=$PWD/DOC_ROOT<br>
         -bash-3.00$ export SIGNATURE="Johnny Willemsen"<br>
         -bash-3.00$ export MAILID=jwillemsen@remedy.nl<br>
@@ -376,14 +378,6 @@
         one build where you run the TAO Hello world test and check if the libraries are having the
         correct version number.</li>
       <li>
-        Mail the approved release announcement out to, at minimum the following: <tt>ciao-users@list.isis.vanderbilt.edu</tt>,
-        <tt>tao-users@list.isis.vanderbilt.edu</tt>, <tt>tao-announce@list.isis.vanderbilt.edu</tt>,
-        <tt>ace-users@list.isis.vanderbilt.edu</tt>, <tt>ace-announce@list.isis.vanderbilt.edu</tt>. 
-        Do this as yourself (not as bugzilla). <b>N.B.</b>
-      You will not be able to post to the users' lists unless you are subscribed to 
-      them. Odds are you will not be able to post to the announce lists at all. Ask 
-      someone else (like Doug or Johnny) to do this step.<br>
-      <li>
         Update in the autobuild archive the file configs/scoreboard/releases.xml with 
         the made release (version number and release date). This is used by the integrated scoreboard on http://scoreboard.theaceorb.nl  Remember to do a changelog entry.</li>
       <li>
@@ -396,6 +390,14 @@
         <li>bin/diff-builds-and-group-fixed-tests-only.sh to give the correct default old_date for this release.</li></ul>
       <li>
         Update the NEWS, TAO/NEWS, and TAO/CIAO/NEWS files to have a new section for the next release.</li>
+      <li>
+        Mail the approved release announcement out to, at minimum the following: <tt>ciao-users@list.isis.vanderbilt.edu</tt>,
+        <tt>tao-users@list.isis.vanderbilt.edu</tt>, <tt>tao-announce@list.isis.vanderbilt.edu</tt>,
+        <tt>ace-users@list.isis.vanderbilt.edu</tt>, <tt>ace-announce@list.isis.vanderbilt.edu</tt>. 
+        Do this as yourself (not as bugzilla). <b>N.B.</b>
+      You will not be able to post to the users' lists unless you are subscribed to 
+      them. Odds are you will not be able to post to the announce lists at all. Ask 
+      someone else (like Doug or Johnny) to do this step.<br>
       </ol>
     </p>
     <hr>
diff --git a/docs/svn/config b/docs/svn/config
index 8074c5b6cbb..59bf7e5e4a4 100644
--- a/docs/svn/config
+++ b/docs/svn/config
@@ -83,6 +83,8 @@ enable-auto-props = yes
 *.aspx=svn:eol-style=native;svn:keywords=Author Date Id Revision
 *.cpp=svn:eol-style=native;svn:keywords=Author Date Id Revision
 *.cxx=svn:eol-style=native;svn:keywords=Author Date Id Revision
+*.patch=svn:eol-style=native;svn:keywords=Author Date Id Revision
+*.dpatch=svn:eol-style=native;svn:keywords=Author Date Id Revision
 *.cc=svn:eol-style=native;svn:keywords=Author Date Id Revision
 *.C=svn:eol-style=native;svn:keywords=Author Date Id Revision
 *.c=svn:eol-style=native;svn:keywords=Author Date Id Revision
diff --git a/docs/svn/svn-prefs.reg b/docs/svn/svn-prefs.reg
index 88cde866921..bf019f83256 100644
--- a/docs/svn/svn-prefs.reg
+++ b/docs/svn/svn-prefs.reg
@@ -37,6 +37,8 @@ REGEDIT4
 "*.aspx"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
 "*.conf"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
 "*.cpp"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
+"*.patch"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
+"*.dpatch"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
 "*.cxx"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
 "*.cc"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
 "*.C"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
diff --git a/etc/index.html b/etc/index.html
index 43495c31cc3..43e1a119cae 100644
--- a/etc/index.html
+++ b/etc/index.html
@@ -35,6 +35,7 @@
     <hr>
     We do have the documentation for previous releases
     <ul>
+      <LI><P><A HREF="5.7.6/html">5.7.6</A></P></LI>
       <LI><P><A HREF="5.7.5/html">5.7.5</A></P></LI>
       <LI><P><A HREF="5.7.4/html">5.7.4</A></P></LI>
       <LI><P><A HREF="5.7.3/html">5.7.3</A></P></LI>
diff --git a/examples/Reactor/Misc/pingpong.cpp b/examples/Reactor/Misc/pingpong.cpp
index 9a7a8566eae..bf36caf99b0 100644
--- a/examples/Reactor/Misc/pingpong.cpp
+++ b/examples/Reactor/Misc/pingpong.cpp
@@ -80,8 +80,10 @@ Ping_Pong::Ping_Pong (char b[], ACE_HANDLE f)
     pid_ (ACE_OS::getpid ()),
     handle_ (f)
 {
-  *((int *) this->buf_) = (int) this->pid_;
-  *((int *) (this->buf_ + sizeof (int))) = 0;
+  int *pi_buf = (int *) this->buf_;
+  *(pi_buf) = (int) this->pid_;
+  pi_buf = (int *) (this->buf_ + sizeof (int));
+  *(pi_buf) = 0;
   ACE_OS::strcpy (this->buf_ + (2 * sizeof (int)), b);
   this->buf_[this->buflen_ - 1] = '\n';
   this->buf_[this->buflen_] = '\0';
diff --git a/html/Stats/index.shtml b/html/Stats/index.shtml
index 242ff09e777..50261c1a2e8 100644
--- a/html/Stats/index.shtml
+++ b/html/Stats/index.shtml
@@ -50,7 +50,7 @@ In addition to the statistics described above, a number of other ACE/TAO/CIAO de
   <a href="http://www.dre.vanderbilt.edu/Scoreboard/">Automated Builds</a>
 </li>
 <li>
-  Xampler Performance benchmarks for <a href="http://www.dre.vanderbilt.edu/~isisbuilds/auto_compile_logs/isislab/emulab/FC6xampler/Template-Display/_Report/">x86</a> and <a href="http://www.dre.vanderbilt.edu/~remedynl/ps3xampler/ps3xampler/_Report/">IBM Cell</a>
+  Xampler Performance benchmarks for <a href="http://www.dre.vanderbilt.edu/~isisbuilds/auto_compile_logs/isislab/emulab/FC6xampler/Template-Display/_Report/">x86</a>, <a href="http://www.dre.vanderbilt.edu/~remedynl/ps3cellbuild_xampler/ps3xampler/_Report/">IBM Cell</a> and <a href="http://www.dre.vanderbilt.edu/~remedynl/mpc440_xampler/mpc440xampler/_Report/">MPC440</a>
 </li>
 <li>
   <a href="http://www.dre.vanderbilt.edu/Stats/CORBAecompact/">Footprint CORBA/e compact</a>
diff --git a/include/makeinclude/platform_freebsd.GNU b/include/makeinclude/platform_freebsd.GNU
index 07eb7a4ccd1..f08842ad483 100644
--- a/include/makeinclude/platform_freebsd.GNU
+++ b/include/makeinclude/platform_freebsd.GNU
@@ -84,9 +84,9 @@ PLATFORM_GTK_CPPFLAGS=$(shell gtk-config --cflags)
 PLATFORM_GTK_LIBS    =$(shell gtk-config --libs)
 PLATFORM_GTK_LDFLAGS =
 
-PLATFORM_FOX_CPPFLAGS=
-PLATFORM_FOX_LIBS=-lFOX
-PLATFORM_FOX_LDFLAGS=
+PLATFORM_FOX_CPPFLAGS ?= -I/usr/include/fox
+PLATFORM_FOX_LIBS ?= -lFOX
+PLATFORM_FOX_LDFLAGS ?=
 
 PLATFORM_TK_CPPFLAGS=$(shell . /usr/local/lib/tk8.*/tkConfig.sh && echo -n $$TK_INCLUDE_SPEC)
 PLATFORM_TK_LIBS=$(shell . /usr/local/lib/tk8.*/tkConfig.sh && echo -n $$TK_LIB_FLAG)
diff --git a/include/makeinclude/platform_g++_common.GNU b/include/makeinclude/platform_g++_common.GNU
index 9611d652435..aa2b0b0720f 100644
--- a/include/makeinclude/platform_g++_common.GNU
+++ b/include/makeinclude/platform_g++_common.GNU
@@ -68,6 +68,10 @@ ifeq ($(GNU_LD),1)
   STATIC_LINK_FLAG ?= -static
 endif # GNU_LD
 
+ifeq ($(no_strict_aliasing), 1)
+  CCFLAGS += -fno-strict-aliasing
+endif
+
 ifeq ($(shared_libs), 1)
   ifneq ($(static_libs_only), 1)
     # Add all symbols to the dynamic symbol table.  Needed to enable
diff --git a/include/makeinclude/platform_gnuwin32_common.GNU b/include/makeinclude/platform_gnuwin32_common.GNU
index f1c4fbac86e..28ce90b3c7f 100644
--- a/include/makeinclude/platform_gnuwin32_common.GNU
+++ b/include/makeinclude/platform_gnuwin32_common.GNU
@@ -10,6 +10,8 @@ ifneq ($(mingw32),1)
   endif
 endif
 
+no_hidden_visibility ?= 1
+
 GNUWIN32_CXX_VERSION := $(shell $(CXX) -dumpversion)
 
 winsock2 ?= 1
diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU
index 96d61a56ae1..a07b3ae4fe1 100644
--- a/include/makeinclude/platform_linux.GNU
+++ b/include/makeinclude/platform_linux.GNU
@@ -53,8 +53,15 @@ endif
 ifeq ($(buildbits),64)
   FLAGS_C_CC += -m64
   LDFLAGS    += -m64
-  ifeq ($(SYSARCH),ppc64)
-    FLAGS_C_CC += -mminimal-toc
+  ifneq ($(CROSS_COMPILE),)
+    PPC64_TARGET := $(shell echo '__powerpc64__' | $(CC) -E - | tail -n 1)
+    ifeq ($(PPC64_TARGET),1)
+      FLAGS_C_CC += -mminimal-toc
+    endif
+  else
+    ifeq ($(SYSARCH),ppc64)
+      FLAGS_C_CC += -mminimal-toc
+    endif
   endif
 endif
 
@@ -90,6 +97,16 @@ PRELIB  = @true
 #
 include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
 
+ifneq ($(TCPU),)
+  ifeq ($(tunemodelflag),1)
+    FLAGS_C_CC += -mtune=$(TCPU)
+  endif
+  
+  ifeq ($(cpumodelflag),1)
+    FLAGS_C_CC += -mcpu=$(TCPU)
+  endif
+endif
+
 # TAO with GCC 4.0.2 and -O3 seems to result in runtime issues, for example
 # the ForwardRequest PI test will fail. For GCC 4.0.2 we default to -O2
 ifeq ($(CXX_VERSION),4.0.2)
diff --git a/include/makeinclude/platform_linux_common.GNU b/include/makeinclude/platform_linux_common.GNU
index 06d58031f97..40686268a2a 100644
--- a/include/makeinclude/platform_linux_common.GNU
+++ b/include/makeinclude/platform_linux_common.GNU
@@ -33,9 +33,9 @@ PLATFORM_GTK_CPPFLAGS=$(shell gtk-config --cflags)
 PLATFORM_GTK_LIBS    =$(shell gtk-config --libs)
 PLATFORM_GTK_LDFLAGS =
 
-PLATFORM_FOX_CPPFLAGS=
-PLATFORM_FOX_LIBS=-lFOX
-PLATFORM_FOX_LDFLAGS=
+PLATFORM_FOX_CPPFLAGS ?= -I/usr/include/fox
+PLATFORM_FOX_LIBS     ?= -lFOX
+PLATFORM_FOX_LDFLAGS  ?=
 
 # NOTE: we only support wxWindows over GTK
 PLATFORM_WX_CPPFLAGS= $(shell wx-config --cxxflags) $(PLATFORM_GTK_CPPFLAGS)
@@ -130,8 +130,8 @@ else
     ifneq (,$(HOST_ROOT))
       TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/ace_gperf
       TAO_IDL = $(HOST_ROOT)/bin/tao_idl
-      TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/bin/tao_idl3_to_idl2
       TAO_IDL_DEP = $(TAO_IDL)
+      TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/TAO/CIAO/bin/tao_idl3_to_idl2
       TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2)
       # make sure to use the target compiler, not the cross-compiler
       # as preprocessor for the cross-compiled idl tools
diff --git a/include/makeinclude/platform_macosx_iphone.GNU b/include/makeinclude/platform_macosx_iphone.GNU
index 448460285c4..a96f739f114 100644
--- a/include/makeinclude/platform_macosx_iphone.GNU
+++ b/include/makeinclude/platform_macosx_iphone.GNU
@@ -1,5 +1,7 @@
 # $Id$
 
+static_libs_only=1
+
 include $(ACE_ROOT)/include/makeinclude/platform_macosx_common.GNU
 
 XCODE:=/Developer
@@ -8,14 +10,22 @@ ifeq ($(IPHONE_TARGET), SIMULATOR)
   IPHONE_PLATFORM:=$(XCODE)/Platforms/iPhoneSimulator.platform/Developer
   IPHONE_SDK:=$(IPHONE_PLATFORM)/SDKs/iPhoneSimulator${IPHONE_VERSION}.sdk
   IPHONE_HARDWARE_ARCHITECTURE=i386
+
+  # crt1.10.6.o is missing under MacOSX 10.6, fallback to 10.5
+  # until apple provides the missing crt1.10.6.o
+  CFLAGS   += -mmacosx-version-min=10.5
+  CXXFLAGS += -mmacosx-version-min=10.5
+  LDFLAGS  += -mmacosx-version-min=10.5
 endif
 
 ifeq ($(IPHONE_TARGET), HARDWARE)
+  CROSS-COMPILE=1
   IPHONE_PLATFORM:=$(XCODE)/Platforms/iPhoneOS.platform/Developer
   IPHONE_SDK:=$(IPHONE_PLATFORM)/SDKs/iPhoneOS${IPHONE_VERSION}.sdk
   IPHONE_HARDWARE_ARCHITECTURE=armv6
   CODESIGN_ALLOCATE:=$(IPHONE_PLATFORM)/usr/bin/codesign_allocate
   POSTLINK=; codesign -f -s "iPhone Developer" $(BIN)
+  rwho = 0
 endif
 
 CC:=$(IPHONE_PLATFORM)/usr/bin/gcc
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
index 2eaebddeae9..54ff9d9336d 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -43,7 +43,9 @@
 compat4 ?= 0
 debug ?= 1
 distrib ?= 1
+rwtools ?= 0
 stdcpplib ?= 1
+stlport ?= 0
 threads ?= 1
 versioned_so ?= 1
 tk_reactor ?= 0
@@ -72,8 +74,6 @@ ifeq (C++ 5.4,$(findstring C++ 5.4,$(CC_VERSION)))
   ACE_CC_PREPROCESSOR = cc
 endif
 
-PLATFORM_STLPORT_CPPFLAGS = -library=stlport4
-
 ifeq ($(atomic_ops_sparc),1)
   CFLAGS += -DACE_HAS_BUILTIN_ATOMIC_OP -DACE_INCLUDE_ATOMIC_OP_SPARC
 endif
@@ -125,20 +125,7 @@ ifeq (C++ 5,$(findstring C++ 5,$(CC_VERSION)))
     CCFLAGS += -compat=4
     CCFLAGS += -features=rtti
   else
-    #### Use old iostreams.
-    ifeq (C++ 5.0,$(findstring C++ 5.0,$(CC_VERSION)))
-      ifeq (1,$(stdcpplib))
-        CCFLAGS += -library=Cstd
-      else
-        CCFLAGS += -library=iostream,no%Cstd
-        CPPFLAGS += -DACE_USES_OLD_IOSTREAMS
-      endif # stdcpplib
-    else
-      ifeq (0,$(stdcpplib))
-        CCFLAGS += -library=iostream
-        CPPFLAGS += -DACE_USES_OLD_IOSTREAMS
-      endif # stdcpplib
-
+    ifneq (C++ 5.0,$(findstring C++ 5.0,$(CC_VERSION)))
       # If 64-bit build is desired, turn that on. If no code gen options
       # are given to Forte 6, the default build is 32-bit, even when
       # building on a 64-bit system. Specifying xarch=v9 generates code
@@ -227,11 +214,27 @@ include $(ACE_ROOT)/include/makeinclude/platform_sunos5_common.GNU
 
 LIBS            += -lsocket -lrt -laio -ldl -lnsl -lgen -lposix4 -ladm
 
-# Sun Studio will not create a default dependency on libCrun and
-# libCstd when building a shared library with the -G option.
-stlport ?= 0
-ifeq ($(stlport),0)
-  LIBS          += -lCrun -lCstd
+# Support alternate CC libraries (i.e. STLport, Tools.h++, Cstd)
+# See: http://docs.sun.com/app/docs/doc/820-7599/bkaty?a=view
+ifeq ($(stlport),1)
+  PLATFORM_STLPORT_CPPFLAGS += -library=stlport4
+else
+  ifeq ($(rwtools),1)
+    ifeq ($(stdcpplib),1)
+      CC_LIBRARY = rwtools7_std
+    else
+      CC_LIBRARY = rwtools7,iostream
+      CPPFLAGS += -DACE_USES_OLD_IOSTREAMS
+    endif
+  else  # default
+    ifeq ($(stdcpplib),1)
+      CC_LIBRARY = Cstd
+    else
+      CC_LIBRARY = no%Cstd,iostream 
+      CPPFLAGS += -DACE_USES_OLD_IOSTREAMS
+    endif
+  endif
+  CPPFLAGS += -library=$(CC_LIBRARY)
 endif
 
 ### CC 5.10 enables annotation support by default; allow user to override
diff --git a/include/makeinclude/platform_win32_msvc.GNU b/include/makeinclude/platform_win32_msvc.GNU
index 962f8870ec5..8bec8100e42 100644
--- a/include/makeinclude/platform_win32_msvc.GNU
+++ b/include/makeinclude/platform_win32_msvc.GNU
@@ -116,7 +116,7 @@ CXXFLAGS = $(CFLAGS)
 RC_INCLUDE_FLAG = -I
 RC_OUTPUT_FLAG = -fo
 SYSTEMLIBS += advapi32.lib user32.lib
-MSVC_LINK = $(LD) $(SYSTEMLIBS) $(MSVC_LDFLAGS) $(patsubst -L%,-libpath:%, $(subst /,\,$(LDFLAGS))) $(patsubst -l%,%.lib,$(ACE_SHLIBS)) $(LIBS) -out:$@
+MSVC_LINK = $(LD) $(SYSTEMLIBS) $(MSVC_LDFLAGS) $(patsubst %\,%,$(patsubst -L%,-libpath:%, $(subst /,\,$(LDFLAGS)))) $(patsubst -l%,%.lib,$(ACE_SHLIBS)) $(LIBS) -out:$@
 define SOLINK.cc.override
 $(MSVC_LINK) $(MSVC_DLLFLAGS) $^
 	mt -nologo -manifest $@.manifest -outputresource:$@\;2
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index c6d62b4f860..521d7d3592c 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -888,6 +888,38 @@ ace_uuid      ?= 1
 ace_filecache ?= 1
 acexml        ?= 1
 
+# Icecream distributed compilation support
+ifeq ($(icecream),1)
+  # check availability of icecc
+  ifneq ($(ICECC_ROOT),)
+    ICECC_PROG := $(ICECC_ROOT)/icecc
+  else
+    ICECC_PROG := $(shell which icecc 2>/dev/null)
+  endif
+  ICECC_VERTEST := $(shell test -x "$(ICECC_PROG)" && $(ICECC_PROG) --version)
+  ifneq (ICECC,$(findstring ICECC,$(ICECC_VERTEST)))
+    # not good, try alternative install location
+    ICECC_PROG := /opt/icecream/bin/icecc
+    ICECC_VERTEST := $(shell test -x "$(ICECC_PROG)" && $(ICECC_PROG) --version)
+    ifneq (ICECC,$(findstring ICECC,$(ICECC_VERTEST)))
+      override icecream := 0
+      $(error Cannot locate valid Icecream compiler.)
+    endif
+  endif
+  ifeq ($(icecream),1)
+    # force LD and DLD to be 'normal' tools
+    override LD := $(LD)
+    override DLD := $(DLD)
+    # define tools that icecc should call for local jobs
+    ICECC_CC := $(CC)
+    ICECC_CXX := $(CXX)
+    export ICECC_CC ICECC_CXX
+    # let all compilation go through icecc
+    CC := $(ICECC_PROG)
+    CXX := $(ICECC_PROG)
+  endif
+endif
+
 #----------------------------------------------------------------------------
 #      Conditional macro definitions
 #----------------------------------------------------------------------------
diff --git a/m4/ace.m4 b/m4/ace.m4
index f6ab11916d6..d27fffa0ab7 100644
--- a/m4/ace.m4
+++ b/m4/ace.m4
@@ -1250,8 +1250,8 @@ AC_DEFUN([ACE_PATH_FL],
    fi
  fi
  if test X"${FLTKCONFIG}" != X; then
-   ACE_FLTK_CPPFLAGS=`$FLTKCONFIG --use-gl --cxxflags 2>/dev/null`
-   ACE_FLTK_LIBS=`$FLTKCONFIG --use-gl --ldflags 2>/dev/null`
+   ACE_FLTK_CPPFLAGS=`$FLTKCONFIG --cxxflags 2>/dev/null`
+   ACE_FLTK_LIBS=`$FLTKCONFIG --ldflags 2>/dev/null`
 
    AC_SUBST(ACE_FLTK_CPPFLAGS)
    AC_SUBST(ACE_FLTK_LIBS)
@@ -1393,6 +1393,7 @@ if test "$no_x" != yes; then
    AC_SUBST(ACE_XT_LIBS)
 fi
 AM_CONDITIONAL([BUILD_ATHENA], true)
+AM_CONDITIONAL([BUILD_ATHENA3D], true)
 AM_CONDITIONAL([BUILD_MOTIF], false)
 ])
 
diff --git a/m4/ace_defines.m4 b/m4/ace_defines.m4
index 08a16407e05..c8b37af9171 100644
--- a/m4/ace_defines.m4
+++ b/m4/ace_defines.m4
@@ -27,7 +27,7 @@ do
 ACE_CHECK_DEFINE($ace_def,
                  [AC_DEFINE_UNQUOTED(AS_TR_CPP([ACE_HAS_$ace_def])) $2],
                  [$3],
-                 [$4])dnl
+                 [$4])
 done
 ])
 
@@ -43,6 +43,6 @@ do
 ACE_CHECK_DEFINE($ace_def,
                  [$2],
                  [AC_DEFINE_UNQUOTED(AS_TR_CPP([ACE_LACKS_$ace_def])) $3],
-                 [$4])dnl
+                 [$4])
 done
 ])
diff --git a/m4/tao.m4 b/m4/tao.m4
new file mode 100644
index 00000000000..1441e8b5316
--- /dev/null
+++ b/m4/tao.m4
@@ -0,0 +1,88 @@
+dnl -------------------------------------------------------------------------
+dnl       $Id$
+dnl
+dnl       tao.m4
+dnl
+dnl       ACE M4 include file which contains TAO specific M4 macros
+dnl       for enabling/disabling certain TAO features.
+dnl
+dnl -------------------------------------------------------------------------
+
+dnl  Copyright (C) 1998, 1999, 2000, 2002  Ossama Othman
+dnl
+dnl  All Rights Reserved
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the current ACE distribution terms.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+
+AC_DEFUN([TAO_ENABLE_MINIMUM_CORBA],
+[AC_ARG_ENABLE([minimum-corba],
+              AS_HELP_STRING([--enable-minimum-corba],
+		             [build TAO with minimum corba support [[[no]]]]),
+[
+case "${enableval}" in
+  yes)
+    tao_user_enable_minimum_corba=yes
+    ;;
+  no)
+    tao_user_enable_minimum_corba=no
+    ;;
+  *)
+    AC_MSG_ERROR([bad value ${enableval} for --enable-minimum-corba])
+    ;;
+esac
+],[
+tao_user_enable_minimum_corba=no
+])
+AM_CONDITIONAL([BUILD_MINIMUM_CORBA], 
+	       [test X$tao_user_enable_minimum_corba = Xyes])
+])
+
+AC_DEFUN([TAO_ENABLE_EXAMPLES],
+[AC_ARG_ENABLE([tao-examples],
+               AS_HELP_STRING([--enable-tao-examples],
+                              [build TAO examples [[[yes]]]]),
+[
+case "${enableval}" in
+  yes)
+    tao_build_examples=yes
+    ;;
+  no)
+    tao_build_examples=no
+    ;;
+  *)
+    AC_MSG_ERROR([bad value ${enableval} for --enable-tao-examples])
+    ;;
+esac
+],[
+tao_build_examples=yes
+])
+AM_CONDITIONAL([BUILD_EXAMPLES], [test X$tao_build_examples = Xyes])
+])
+
+AC_DEFUN([TAO_ENABLE_TESTS],
+[AC_ARG_ENABLE([tao-tests],
+               AS_HELP_STRING([--enable-tao-tests],
+			      [build TAO tests [[[yes]]]]),
+[
+case "${enableval}" in
+  yes)
+    tao_build_tests=yes
+    ;;
+  no)
+    tao_build_tests=no
+    ;;
+  *)
+    AC_MSG_ERROR([bad value ${enableval} for --enable-tao-tests])
+    ;;
+esac
+],[
+tao_build_tests=yes
+])
+AM_CONDITIONAL([BUILD_TESTS], [test X$tao_build_tests = Xyes])
+])
diff --git a/rpmbuild/ace-tao.spec b/rpmbuild/ace-tao.spec
index ae1a82bc35a..d7793cfa159 100644
--- a/rpmbuild/ace-tao.spec
+++ b/rpmbuild/ace-tao.spec
@@ -1,7 +1,7 @@
 # Set the version number here.
-%define ACEVER  5.7.5
-%define TAOVER  1.7.5
-%define CIAOVER 0.7.5
+%define ACEVER  5.7.6
+%define TAOVER  1.7.6
+%define CIAOVER 0.7.6
 
 # Conditional build
 # Default values are
@@ -2356,6 +2356,8 @@ fi
 %doc TAO/PROBLEM-REPORT-FORM
 %doc TAO/VERSION
 %doc TAO/README
+%doc TAO/utils/catior/README.catior
+%doc TAO/utils/catior/README.nslist
 
 # ---------------- tao-cosnaming ----------------
 
diff --git a/tests/Atomic_Op_Test.cpp b/tests/Atomic_Op_Test.cpp
index d807b287684..00dfc06c8af 100644
--- a/tests/Atomic_Op_Test.cpp
+++ b/tests/Atomic_Op_Test.cpp
@@ -25,6 +25,8 @@ ACE_RCSID(tests, Atomic_Op_Test, "$Id$")
 
 #include "ace/Atomic_Op.h"
 #include "ace/Synch_Traits.h"
+#include "ace/Time_Value.h"
+#include "ace/OS_NS_sys_time.h"
 
 enum { TEST_ITERATIONS = 1000000 };
 
@@ -69,7 +71,10 @@ run_main (int, ACE_TCHAR *[])
   ACE_ASSERT (foo == 7);
   ACE_ASSERT (foo2 == 7);
 
+  ACE_UINT64 usec;
+
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <long> assignment %D\n")));
+  ACE_Time_Value diff = ACE_OS::gettimeofday ();
   int i;
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
@@ -78,9 +83,12 @@ run_main (int, ACE_TCHAR *[])
       foo = 3;
       foo = 4;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> assignment %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> assignment %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <long> increment %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       ++foo;
@@ -88,9 +96,12 @@ run_main (int, ACE_TCHAR *[])
       ++foo;
       ++foo;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> increment %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> increment %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <long> decrement %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       --foo;
@@ -98,9 +109,12 @@ run_main (int, ACE_TCHAR *[])
       --foo;
       --foo;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> decrement %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> decrement %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <long> addition %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       foo += 5;
@@ -108,9 +122,12 @@ run_main (int, ACE_TCHAR *[])
       foo += 5;
       foo += 5;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> addition %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> addition %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <long> subtraction %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       foo -= 5;
@@ -118,7 +135,9 @@ run_main (int, ACE_TCHAR *[])
       foo -= 5;
       foo -= 5;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> subtraction %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> subtraction %D, took %Q\n"), usec));
 
   ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned long> foo_unsigned (5);
 
@@ -157,6 +176,7 @@ run_main (int, ACE_TCHAR *[])
   ACE_ASSERT (foo_unsigned2 == 7);
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned long> assignment %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       foo_unsigned = 1;
@@ -164,9 +184,12 @@ run_main (int, ACE_TCHAR *[])
       foo_unsigned = 3;
       foo_unsigned = 4;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> assignment %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> assignment %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned long> increment %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       ++foo_unsigned;
@@ -174,9 +197,12 @@ run_main (int, ACE_TCHAR *[])
       ++foo_unsigned;
       ++foo_unsigned;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> increment %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> increment %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned long> decrement %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       --foo_unsigned;
@@ -184,9 +210,12 @@ run_main (int, ACE_TCHAR *[])
       --foo_unsigned;
       --foo_unsigned;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> decrement %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> decrement %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned long> addition %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       foo_unsigned += 5;
@@ -194,9 +223,12 @@ run_main (int, ACE_TCHAR *[])
       foo_unsigned += 5;
       foo_unsigned += 5;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> addition %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> addition %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned long> subtraction %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       foo_unsigned -= 5;
@@ -204,7 +236,9 @@ run_main (int, ACE_TCHAR *[])
       foo_unsigned -= 5;
       foo_unsigned -= 5;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> subtraction %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> subtraction %D, took %Q\n"), usec));
 
   ACE_Atomic_Op <ACE_SYNCH_MUTEX, int> bar (5);
 
@@ -243,6 +277,7 @@ run_main (int, ACE_TCHAR *[])
   ACE_ASSERT (bar2 == 7);
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <int> assignment %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       bar = 1;
@@ -250,9 +285,12 @@ run_main (int, ACE_TCHAR *[])
       bar = 3;
       bar = 4;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> assignment %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> assignment %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <int> increment %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       ++bar;
@@ -260,9 +298,12 @@ run_main (int, ACE_TCHAR *[])
       ++bar;
       ++bar;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> increment %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> increment %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <int> decrement %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       --bar;
@@ -270,9 +311,12 @@ run_main (int, ACE_TCHAR *[])
       --bar;
       --bar;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> decrement %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> decrement %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <int> addition %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       bar += 5;
@@ -280,9 +324,12 @@ run_main (int, ACE_TCHAR *[])
       bar += 5;
       bar += 5;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> addition %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> addition %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <int> subtraction %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       bar -= 5;
@@ -290,7 +337,9 @@ run_main (int, ACE_TCHAR *[])
       bar -= 5;
       bar -= 5;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> subtraction %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> subtraction %D, took %Q\n"), usec));
 
   ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned int> unsigned_bar (5);
 
@@ -329,6 +378,7 @@ run_main (int, ACE_TCHAR *[])
   ACE_ASSERT (unsigned_bar2 == 7);
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned int> assignment %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       unsigned_bar = 1;
@@ -336,9 +386,12 @@ run_main (int, ACE_TCHAR *[])
       unsigned_bar = 3;
       unsigned_bar = 4;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> assignment %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> assignment %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned int> increment %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       ++unsigned_bar;
@@ -346,9 +399,12 @@ run_main (int, ACE_TCHAR *[])
       ++unsigned_bar;
       ++unsigned_bar;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> increment %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> increment %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned int> decrement %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       --unsigned_bar;
@@ -356,9 +412,12 @@ run_main (int, ACE_TCHAR *[])
       --unsigned_bar;
       --unsigned_bar;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> decrement %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> decrement %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned int> addition %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       unsigned_bar += 5;
@@ -366,9 +425,12 @@ run_main (int, ACE_TCHAR *[])
       unsigned_bar += 5;
       unsigned_bar += 5;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> addition %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> addition %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned int> subtraction %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       unsigned_bar -= 5;
@@ -376,8 +438,9 @@ run_main (int, ACE_TCHAR *[])
       unsigned_bar -= 5;
       unsigned_bar -= 5;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> subtraction %D\n")));
-
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> subtraction %D, took %Q\n"), usec));
 
   ACE_END_TEST;
   return 0;
diff --git a/tests/Bug_2434_Regression_Test.cpp b/tests/Bug_2434_Regression_Test.cpp
new file mode 100644
index 00000000000..d3d6ce324fc
--- /dev/null
+++ b/tests/Bug_2434_Regression_Test.cpp
@@ -0,0 +1,68 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    tests
+//
+// = FILENAME
+//    Bug_2434_Regression_Test.cpp
+//
+// = DESCRIPTION
+//      This is a simple test of ACE_Time_Value.  No command line arguments
+//      are needed to run the test.  It also tests the ACE_U_LongLong class.
+//      Because ACE_U_LongLong is used for ACE_hrtime_t on some platforms,
+//      this seems like a reasonable place to test it.
+//
+// = AUTHOR
+//    Prashant Jain <pjain@cs.wustl.edu> and David Levine <levine@cs.wustl.edu>
+//
+// ============================================================================
+
+// Note, for this test the config.h file *must* come first!
+#include "ace/config-all.h"
+
+ACE_RCSID(tests, Bug_2434_Regression_Test, "$Id$")
+
+#include "test_config.h"
+#include "ace/ACE.h"
+#include "ace/Time_Value.h"
+#include "ace/Numeric_Limits.h"
+
+int
+run_main (int, ACE_TCHAR *[])
+{
+  int ret = 0;
+
+  ACE_START_TEST (ACE_TEXT ("Bug_2434_Regression_Test"));
+
+  ACE_Time_Value tv1;
+  ACE_Time_Value tv2;
+
+  const time_t max_time_t = ACE_Numeric_Limits<time_t>::max ();
+  const time_t min_time_t = ACE_Numeric_Limits<time_t>::min ();
+
+  // test saturated result
+  tv1.set (max_time_t - 1, 499999);
+  tv2.set (max_time_t, 999999);  // ACE_Time_Value::max_time
+  tv1 *= 10.0;
+  ACE_ASSERT (tv1 == tv2);
+  tv1.set (max_time_t - 1, 499999);
+  tv2.set (min_time_t, -999999);
+  tv1 *= -10.0;
+  ACE_ASSERT (tv1 == tv2);
+
+  // test results near limits
+  tv1.set ((max_time_t >> 1), 499999);
+  tv2.set ((-(max_time_t >> 1) << 1), -999998);
+  tv1 *= -2.0;
+  ACE_ASSERT (tv1 == tv2);
+  tv1.set (max_time_t >> 1, 499999);
+  tv2.set (((max_time_t >> 1) << 1), 999998);
+  tv1 *= 2.0;
+  ACE_ASSERT (tv1 == tv2);
+
+  ACE_END_TEST;
+
+  return ret;
+}
diff --git a/tests/Bug_2980_Regression_Test.cpp b/tests/Bug_2980_Regression_Test.cpp
index c8cf34e84fe..c38593d9b10 100644
--- a/tests/Bug_2980_Regression_Test.cpp
+++ b/tests/Bug_2980_Regression_Test.cpp
@@ -4,6 +4,7 @@
 #include <iostream>
 #include <assert.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "ace/config-lite.h"
 
diff --git a/tests/Bug_3709_Regression_Test.cpp b/tests/Bug_3709_Regression_Test.cpp
index 131a0d2a45e..5fc6f8646c8 100644
--- a/tests/Bug_3709_Regression_Test.cpp
+++ b/tests/Bug_3709_Regression_Test.cpp
@@ -18,6 +18,11 @@ ACE_RCSID (tests,
            Bug_3709_Regression_Test,
            "$Id$")
 
+#if defined(_MSC_VER) && _MSC_VER < 1400
+#define MSVC_71_OR_OLDER
+#endif
+
+#ifndef MSVC_71_OR_OLDER
 template<template<typename U, typename = std::allocator<U> > class container, typename DT>
 container<DT> initializer(const DT &d)
 {
@@ -25,14 +30,17 @@ container<DT> initializer(const DT &d)
   t.insert(t.end(), d);
   return t;
 }
+#endif
 
 int
 run_main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT ("Bug_3709_Regression_Test"));
 
+#ifndef MSVC_71_OR_OLDER
   vector<int> v = initializer<vector>(5);
   v.clear ();
+#endif
 
   ACE_END_TEST;
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b9a4933d4a6..d7e41648e32 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2480,6 +2480,20 @@ Reactor_Exceptions_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+noinst_PROGRAMS += Reactor_Fairness_Test
+
+Reactor_Fairness_Test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR)
+
+Reactor_Fairness_Test_SOURCES = \
+  $(ACE_ROOT)/tests/Main.cpp \
+  Reactor_Fairness_Test.cpp
+
+Reactor_Fairness_Test_LDADD = \
+  libTest_Output.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
 ## Makefile.Reactor_Notification_Queue_Test.am
 
 noinst_PROGRAMS += Reactor_Notification_Queue_Test
diff --git a/tests/Multicast_Test.cpp b/tests/Multicast_Test.cpp
index b3c22a41c11..6fa18ca5a65 100644
--- a/tests/Multicast_Test.cpp
+++ b/tests/Multicast_Test.cpp
@@ -448,11 +448,19 @@ public:
                       = ACE_SOCK_Dgram_Mcast::DEFOPTS);
   virtual ~MCT_Event_Handler (void);
 
+#if defined (__linux__)
+  int join (const ACE_INET_Addr &mcast_addr,
+            int reuse_addr = 1,
+            const ACE_TCHAR *net_if = ACE_TEXT ("lo"));
+  int leave (const ACE_INET_Addr &mcast_addr,
+             const ACE_TCHAR *net_if = ACE_TEXT ("lo"));
+#else
   int join (const ACE_INET_Addr &mcast_addr,
             int reuse_addr = 1,
             const ACE_TCHAR *net_if = 0);
   int leave (const ACE_INET_Addr &mcast_addr,
              const ACE_TCHAR *net_if = 0);
+#endif
 
   // = Event Handler hooks.
   virtual int handle_input (ACE_HANDLE handle);
@@ -506,8 +514,8 @@ MCT_Event_Handler::mcast (void)
 int
 MCT_Event_Handler::find (const char *buf)
 {
-  size_t size = this->address_vec_.size ();
-  size_t i;
+  size_t const size = this->address_vec_.size ();
+  size_t i = 0;
   for (i = 0; i < size; ++i)
     {
       if (ACE_OS::strcasecmp (buf, this->address_vec_[i]->c_str ()) == 0)
@@ -672,7 +680,7 @@ MCT_Task::~MCT_Task (void)
 int
 MCT_Task::open (void *)
 {
-  MCT_Event_Handler *handler;
+  MCT_Event_Handler *handler = 0;
 
   ACE_INET_Addr addr = this->config_.group_start ();
   int groups = this->config_.groups ();
@@ -779,7 +787,9 @@ int producer (MCT_Config &config)
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("Starting producer...\n")));
   ACE_SOCK_Dgram socket (ACE_sap_any_cast (ACE_INET_Addr &), PF_INET);
   //FUZZ: enable check_for_lack_ACE_OS
-
+#if defined (__linux__)
+  socket.set_nic (ACE_TEXT("lo"));
+#endif
   // Note that is is IPv4 specific and needs to be changed once
   //
   if (config.ttl () > 1)
diff --git a/tests/NonBlocking_Conn_Test.cpp b/tests/NonBlocking_Conn_Test.cpp
index 80e25c63cfb..7ca7df557a2 100644
--- a/tests/NonBlocking_Conn_Test.cpp
+++ b/tests/NonBlocking_Conn_Test.cpp
@@ -30,9 +30,10 @@
 #include "ace/WFMO_Reactor.h"
 #include "ace/Get_Opt.h"
 
-static int test_select_reactor = 1;
-static int test_tp_reactor = 1;
-static int test_wfmo_reactor = 1;
+static bool test_select_reactor = true;
+static bool test_tp_reactor = true;
+static bool test_wfmo_reactor = true;
+static int result = 0;
 
 Svc_Handler::Svc_Handler (void)
   : status_ (0),
@@ -58,8 +59,7 @@ Svc_Handler::open (void *)
 }
 
 int
-Svc_Handler::handle_close (ACE_HANDLE handle,
-                           ACE_Reactor_Mask mask)
+Svc_Handler::handle_close (ACE_HANDLE handle, ACE_Reactor_Mask mask)
 {
   *this->status_ = FAILED;
   (*this->completion_counter_)++;
@@ -68,9 +68,7 @@ Svc_Handler::handle_close (ACE_HANDLE handle,
                                                                          mask);
 }
 
-typedef ACE_Connector<Svc_Handler,
-                      ACE_SOCK_CONNECTOR>
-        CONNECTOR;
+typedef ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR> CONNECTOR;
 
 static const char* hosts[] = {
   "www.russiantvguide.com:80",
@@ -139,10 +137,10 @@ test_connect (ACE_Reactor &reactor,
                                    1);
 
       ACE_DEBUG ((LM_DEBUG,
-                  "Connection to %s %s\n",
+                  ACE_TEXT ("Connection to %s %s\n"),
                   buffer,
                   connection_status[i] == Svc_Handler::SUCCEEDED ?
-                  "succeeded" : "failed"));
+                  ACE_TEXT("succeeded") : ACE_TEXT("failed")));
 
       if (connection_status[i] == Svc_Handler::SUCCEEDED)
         {
@@ -157,11 +155,11 @@ test_connect (ACE_Reactor &reactor,
 void
 test (ACE_Reactor_Impl *impl)
 {
-  size_t nr_names = sizeof hosts / sizeof (char *);
-  ACE_INET_Addr *addresses =
-    new ACE_INET_Addr[nr_names];
+  size_t const nr_names = sizeof hosts / sizeof (char *);
+  ACE_INET_Addr *addresses = new ACE_INET_Addr[nr_names];
+  number_of_connections = 0;
 
-  for (size_t i = 0, number_of_connections = 0; i < nr_names; ++i)
+  for (size_t i = 0; i < nr_names; ++i)
     {
       if (addresses[number_of_connections].set (hosts[i]) == 0)
         ++number_of_connections;
@@ -171,8 +169,7 @@ test (ACE_Reactor_Impl *impl)
                     ACE_TEXT_CHAR_TO_TCHAR (hosts[i])));
     }
 
-  ACE_Reactor reactor (impl,
-                       1);
+  ACE_Reactor reactor (impl, 1);
 
   int complete_nonblocking_connections = 1;
   int dont_wait_for_nonblocking_connections = 0;
@@ -182,7 +179,7 @@ test (ACE_Reactor_Impl *impl)
     ACE_Synch_Options::defaults;
 
   ACE_DEBUG ((LM_DEBUG,
-              "\nBlocking connections...\n\n"));
+              "Blocking connections...\n"));
 
   test_connect (reactor,
                 addresses,
@@ -193,7 +190,7 @@ test (ACE_Reactor_Impl *impl)
                         ACE_Time_Value (0, 50 * 1000));
 
   ACE_DEBUG ((LM_DEBUG,
-              "\nBlocking connections (with timeouts)...\n\n"));
+              "Blocking connections (with timeouts)...\n"));
 
   test_connect (reactor,
                 addresses,
@@ -204,7 +201,7 @@ test (ACE_Reactor_Impl *impl)
     (ACE_Synch_Options::USE_REACTOR);
 
   ACE_DEBUG ((LM_DEBUG,
-              "\nNon-blocking connections...\n\n"));
+              "Non-blocking connections...\n"));
 
   test_connect (reactor,
                 addresses,
@@ -212,7 +209,7 @@ test (ACE_Reactor_Impl *impl)
                 complete_nonblocking_connections);
 
   ACE_DEBUG ((LM_DEBUG,
-              "\nNon-blocking connections (without waiting for completions)...\n\n"));
+              "Non-blocking connections (without waiting for completions)...\n"));
 
   test_connect (reactor,
                 addresses,
@@ -224,7 +221,7 @@ test (ACE_Reactor_Impl *impl)
                            ACE_Time_Value (0, 500 * 1000));
 
   ACE_DEBUG ((LM_DEBUG,
-              "\nNon-blocking connections (with timeouts)...\n\n"));
+              "Non-blocking connections (with timeouts)...\n"));
 
   test_connect (reactor,
                 addresses,
@@ -279,15 +276,14 @@ run_main (int argc, ACE_TCHAR *argv[])
   ACE_START_TEST (ACE_TEXT ("NonBlocking_Conn_Test"));
 
   // Validate options.
-  int result =
-    parse_args (argc, argv);
+  result = parse_args (argc, argv);
   if (result != 0)
     return result;
 
   if (test_select_reactor)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "\n\nTesting Select Reactor....\n\n"));
+                  "Testing Select Reactor....\n"));
 
       test (new ACE_Select_Reactor);
     }
@@ -295,7 +291,7 @@ run_main (int argc, ACE_TCHAR *argv[])
   if (test_tp_reactor)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "\n\nTesting TP Reactor....\n\n"));
+                  "Testing TP Reactor....\n"));
 
       test (new ACE_TP_Reactor);
     }
@@ -305,7 +301,7 @@ run_main (int argc, ACE_TCHAR *argv[])
   if (test_wfmo_reactor)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "\n\nTesting WFMO Reactor....\n\n"));
+                  "Testing WFMO Reactor....\n"));
 
       test (new ACE_WFMO_Reactor);
     }
@@ -314,6 +310,6 @@ run_main (int argc, ACE_TCHAR *argv[])
 
   ACE_END_TEST;
 
-  return 0;
+  return result;
 }
 
diff --git a/tests/OS_Test.cpp b/tests/OS_Test.cpp
index cca9e59048a..ae914515716 100644
--- a/tests/OS_Test.cpp
+++ b/tests/OS_Test.cpp
@@ -931,7 +931,7 @@ strsignal_test (void)
         }
       else
         {
-          ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" Sig #%d: %s\n"), i, result));
+          ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" Sig #%d: %C\n"), i, result));
         }
     }
 
@@ -1153,7 +1153,11 @@ ceil_test (void)
       result = ACE_OS::ceil (values [i]);
       if (!is_equal(result, results[i]))
         {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("ceil error: input %.1F, output %1F, expected %1F\n"), values [i], result, results [i]));
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("ceil error: input %.1F, output %1F, expected %1F\n"),
+                      values [i],
+                      result,
+                      results [i]));
           error_count++;
         }
     }
@@ -1177,7 +1181,65 @@ floor_test (void)
       result = ACE_OS::floor (values [i]);
       if (!is_equal(result, results[i]))
         {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("floor error: input %.1F, output %1F, expected %1F\n"), values [i], result, results [i]));
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("floor error: input %.1F, output %1F, expected %1F\n"),
+                      values [i],
+                      result,
+                      results [i]));
+          error_count++;
+        }
+    }
+
+  return error_count;
+}
+
+int
+ceill_test (void)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("Testing ceill method\n")));
+
+  long double values[]  = {-2.5, -1.5, 1.5, 2.5};
+  long double results[] = {-2.0, -1.0, 2.0, 3.0};
+  long double result = 0.0;
+  int error_count = 0;
+
+  for (size_t i = 0 ; i < sizeof (values) / sizeof (long double) ; i++)
+    {
+      result = ACE_OS::ceil (values [i]);
+      if (!is_equal(result, results[i]))
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("ceil error: input %.1F, output %1F, expected %1F\n"),
+                      values [i],
+                      result,
+                      results [i]));
+          error_count++;
+        }
+    }
+
+  return error_count;
+}
+
+int
+floorl_test (void)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("Testing floorl method\n")));
+
+  long double values[]  = {-2.5, -1.5, 1.5, 2.5};
+  long double results[] = {-3.0, -2.0, 1.0, 2.0};
+  long double result = 0.0;
+  int error_count = 0;
+
+  for (size_t i = 0 ; i < sizeof (values) / sizeof (long double) ; i++)
+    {
+      result = ACE_OS::floor (values [i]);
+      if (!is_equal(result, results[i]))
+        {
+          ACE_ERROR ((LM_ERROR, 
+                      ACE_TEXT ("floor error: input %.1F, output %1F, expected %1F\n"), 
+                      values [i], result, results [i]));
           error_count++;
         }
     }
@@ -1252,6 +1314,12 @@ run_main (int, ACE_TCHAR *[])
   if ((result = floor_test ()) != 0)
       status = result;
 
+  if ((result = ceill_test ()) != 0)
+      status = result;
+
+  if ((result = floorl_test ()) != 0)
+      status = result;
+
   if ((result = log2_test ()) != 0)
       status = result;
 
diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp
index 92a22214c74..a4f0d3123ba 100644
--- a/tests/Process_Strategy_Test.cpp
+++ b/tests/Process_Strategy_Test.cpp
@@ -85,7 +85,7 @@ static void
 connection_completed (void)
 {
   // Increment connection counter.
-  connections++;
+  ++connections;
 
   // If all connections have been serviced.
   if (connections == ACE_MAX_ITERATIONS + 1)
diff --git a/tests/Process_Test.cpp b/tests/Process_Test.cpp
index 11c2e22a40e..16fe303aef9 100644
--- a/tests/Process_Test.cpp
+++ b/tests/Process_Test.cpp
@@ -43,33 +43,33 @@ check_temp_file (const ACE_TString &tmpfilename)
   ACE_OS::memset (&entr, 0, sizeof (entr));
 
   // Loop through /proc/self/fs/
-  if (entr.open (ACE_TEXT_CHAR_TO_TCHAR(proc_self_fd)) == -1) 
+  if (entr.open (ACE_TEXT_CHAR_TO_TCHAR(proc_self_fd)) == -1)
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("Could not open dir %C\n"),
                          proc_self_fd),
                          -1);
 
-  while ((dir = entr.read ())) 
+  while ((dir = entr.read ()))
     {
       ACE_CString fullp = proc_self_fd;
 #if defined (ACE_HAS_TCHAR_DIRENT)
       fullp += ACE_TEXT_ALWAYS_CHAR(dir->d_name);
 #else
       fullp += dir->d_name;
-#endif      
+#endif
 
-      if ((ACE_OS::lstat (fullp.c_str (), &stat)) == -1) 
+      if ((ACE_OS::lstat (fullp.c_str (), &stat)) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("Stat failed for %C\n"),
                            fullp.c_str ()),
                           -1);
 
-      if (S_ISLNK (stat.st_mode)) 
+      if (S_ISLNK (stat.st_mode))
         {
           ssize_t size = 0;
-          if ((size= ACE_OS::readlink (fullp.c_str (), 
-                                       filename, 
-                                       MAXPATHLEN + 1)) == -1) 
+          if ((size= ACE_OS::readlink (fullp.c_str (),
+                                       filename,
+                                       MAXPATHLEN + 1)) == -1)
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("Readlink failed for %C\n"),
                                fullp.c_str ()),
@@ -91,13 +91,13 @@ run_parent (bool inherit_files)
   // Create tempfile. This will be tested for inheritance.
   ACE_TCHAR tempfile[MAXPATHLEN + 1];
 
-  if (ACE::get_temp_dir (tempfile, MAXPATHLEN - sizeof (t)) == -1) 
+  if (ACE::get_temp_dir (tempfile, MAXPATHLEN - sizeof (t)) == -1)
     ACE_ERROR ((LM_ERROR, ACE_TEXT ("Could not get temp dir\n")));
 
   ACE_OS::strcat (tempfile, t);
 
   ACE_HANDLE file_handle = ACE_OS::mkstemp (tempfile);
-  if (file_handle == ACE_INVALID_HANDLE) 
+  if (file_handle == ACE_INVALID_HANDLE)
     ACE_ERROR ((LM_ERROR, ACE_TEXT ("Could not get temp filename\n")));
 
   // Build child options
@@ -109,7 +109,7 @@ run_parent (bool inherit_files)
                         (int)inherit_files,
                         tempfile);
   options.handle_inheritance (inherit_files); /* ! */
- 
+
   // Spawn child
   ACE_Process child;
 
@@ -125,7 +125,7 @@ run_parent (bool inherit_files)
   result = child.wait (&child_status);
   if (result == -1)
     ACE_ERROR ((LM_ERROR, ACE_TEXT ("Could NOT wait on child process\n")));
-  else if (child_status == 0) 
+  else if (child_status == 0)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("Child %d finished ok\n"),
                 child.getpid ()));
@@ -162,7 +162,7 @@ run_main (int argc, ACE_TCHAR *argv[])
 
   ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("ch:f:"));
 
-  while ((c = getopt ()) != -1) 
+  while ((c = getopt ()) != -1)
       switch ((char) c)
         {
         case 'c':
@@ -182,10 +182,10 @@ run_main (int argc, ACE_TCHAR *argv[])
           break;
         }
 
-  if (ischild) 
+  if (ischild)
     {
       ACE_TCHAR lognm[MAXPATHLEN];
-      int mypid (ACE_OS::getpid ());
+      int const mypid (ACE_OS::getpid ());
       ACE_OS::sprintf(lognm, ACE_TEXT ("Process_Test-child-%d"), mypid);
 
       ACE_START_TEST (lognm);
@@ -196,15 +196,16 @@ run_main (int argc, ACE_TCHAR *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("Could not retrieve open files\n")),
                           -1);
-      else if (result == handle_inherit) 
+      else if (result == handle_inherit)
         result = 0;
-      else 
+      else
         ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Handle inheritance test failed\n")));
+                    ACE_TEXT ("Handle inheritance test failed with ")
+                    ACE_TEXT ("%d, expected %d\n"), result, handle_inherit));
       ACE_END_LOG;
       return result;
     }
-  else 
+  else
     {
       ACE_START_TEST (ACE_TEXT ("Process_Test"));
 
@@ -215,7 +216,7 @@ run_main (int argc, ACE_TCHAR *argv[])
       run_parent (false);
 
       ACE_END_TEST;
-    } 
+    }
 #endif /* ! ACE_LACKS_FORK */
 
   return 0;
diff --git a/tests/Reactor_Fairness_Test.cpp b/tests/Reactor_Fairness_Test.cpp
new file mode 100644
index 00000000000..c9f3e746bb9
--- /dev/null
+++ b/tests/Reactor_Fairness_Test.cpp
@@ -0,0 +1,409 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    tests
+//
+// = FILENAME
+//    Reactor_Performance_Test.cpp
+//
+// = DESCRIPTION
+//    This test is used to time the dispatching mechanisms of the
+//    <ACE_Reactor>s. Both the <ACE_WFMO_Reactor> and
+//    <ACE_Select_Reactor> can be tested.
+//
+// = AUTHOR
+//    Irfan Pyarali <irfan@cs.wustl.edu>
+//
+// ============================================================================
+
+#include "test_config.h"
+#include "Reactor_Fairness_Test.h"
+#include "ace/Get_Opt.h"
+#include "ace/SOCK_Connector.h"
+#include "ace/SOCK_Acceptor.h"
+#include "ace/Acceptor.h"
+#include "ace/Reactor.h"
+#include "ace/Dev_Poll_Reactor.h"
+#include "ace/WFMO_Reactor.h"
+#include "ace/Select_Reactor.h"
+#include "ace/TP_Reactor.h"
+#include "ace/Auto_Ptr.h"
+#include "ace/Numeric_Limits.h"
+#include "ace/Signal.h"
+#include "ace/Atomic_Op.h"
+#include "ace/Thread_Mutex.h"
+
+ACE_RCSID(tests, Reactor_Fairness_Test, "$Id$")
+
+#if defined (ACE_HAS_THREADS)
+
+namespace {
+
+  const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz";
+
+  // Number of connections to run
+  int opt_nconnections = 5;
+
+  // How many seconds to run the test on each reactor
+  int opt_secs = 30;
+
+  // How many thread to run in the reactor loop
+  int opt_reactor_threads = 3;
+
+  // Extra debug messages
+  int opt_debug = 0;
+
+  ACE_Atomic_Op<ACE_Thread_Mutex, int> reactor_thread_nr = 0;
+
+  // Class to collect and report on data handling for each test pass.
+  struct Result_Set {
+    int nr_conns;
+    typedef ACE_Array_Map<ACE_HANDLE, unsigned int> report_map;
+    report_map reports;
+
+    void reset (int n_connections)   // Reset for next run
+    {
+      reports.clear ();
+      nr_conns = n_connections;
+    }
+
+    void report (ACE_HANDLE h, unsigned int chunks)
+    {
+      std::pair<ACE_HANDLE, unsigned int> newval (h, chunks);
+      reports.insert (newval);
+    }
+
+    // Return 1 if this looks like a failure wrt fairness.
+    int analyze_reports (void)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("Results (%d entries):\n"),
+                  reports.size()));
+      unsigned int max_chunks = 0;
+      unsigned int min_chunks = ACE_Numeric_Limits<unsigned int>::max();
+      for (report_map::iterator iter = reports.begin();
+           iter != reports.end ();
+           ++iter)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("   handle %d: %u\n"),
+                      (*iter).first, (*iter).second));
+          if ((*iter).second > max_chunks)
+            max_chunks = (*iter).second;
+          if ((*iter).second < min_chunks)
+            min_chunks = (*iter).second;
+        }
+      if ((max_chunks - min_chunks) > max_chunks / 10)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("Too much unfairness (max %u, min %u)\n"),
+                           max_chunks,
+                           min_chunks),
+                          1);
+      return 0;
+    }
+  };
+  Result_Set results;
+}
+
+// Handle incoming data
+int
+Read_Handler::handle_input (ACE_HANDLE h)
+{
+  char buf[BUFSIZ];
+  ssize_t result = this->peer ().recv (buf, ACE_OS::strlen(ACE_ALPHABET));
+  if (opt_debug)
+    ACE_DEBUG((LM_DEBUG,
+               ACE_TEXT ("(%t) Read_Handler::handle_input h %d, result %b\n"),
+               h, result));
+  if (result > 0)
+    {
+      if (opt_debug)
+        {
+          buf[result] = 0;
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("(%t) Read_Handler::handle_input: h %d: %C\n"),
+                      h,
+                      buf));
+        }
+      ++this->chunks_in;
+    }
+  else if (result < 0)
+    {
+      if (errno == EWOULDBLOCK)
+        return 0;
+      else
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("handle_input: h %d: %p (errno: %d)\n"),
+                      h, ACE_TEXT ("recv"), ACE_ERRNO_GET));
+
+          // This will cause handle_close to get called.
+          return -1;
+        }
+    }
+  else // result == 0
+    {
+      if (opt_debug)
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Handle %d closing\n"), h));
+      // This will cause handle_close to get called.
+      return -1;
+    }
+
+  return 0;
+}
+
+// Handle connection shutdown.
+
+int
+Read_Handler::handle_close (ACE_HANDLE handle,
+                            ACE_Reactor_Mask /*close_mask*/)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("(%t) Read_Handler handle %d close; %u chunks\n"),
+              handle, chunks_in));
+  results.report (handle, this->chunks_in);
+
+  // Shutdown
+  this->destroy ();
+  return 0;
+}
+
+// Pump data as fast as possible to all the sockets.
+ACE_THR_FUNC_RETURN
+sender (void *arg)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("(%t) running sender\n")));
+
+  // Ensure an error, not a signal, on broken pipe.
+  ACE_Sig_Action no_sigpipe ((ACE_SignalHandler) SIG_IGN);
+  ACE_Sig_Action original_action;
+  no_sigpipe.register_action (SIGPIPE, &original_action);
+
+  ACE_INET_Addr *connection_addr =
+    reinterpret_cast<ACE_INET_Addr *> (arg);
+
+  int i;
+
+  // Automagic memory cleanup.
+  ACE_SOCK_Stream *temp_socks = 0;
+  ACE_NEW_RETURN (temp_socks,
+                  ACE_SOCK_Stream [opt_nconnections],
+                  0);
+  ACE_Auto_Basic_Array_Ptr <ACE_SOCK_Stream> socks (temp_socks);
+
+  // Connection all <opt_nconnections> connections before sending data.
+  ACE_SOCK_Connector c;
+  for (i = 0; i < opt_nconnections; i++)
+    {
+      if (c.connect (socks[i], *connection_addr) == -1)
+        {
+          if (errno != ECONNREFUSED || i == 0)
+            {
+              ACE_ERROR ((LM_ERROR,
+                          ACE_TEXT ("(%t) conn %d %p\n"),
+                          ACE_TEXT ("connect")));
+              while (--i >= 0)
+                socks[i].close ();
+              break;
+            }
+        }
+      socks[i].enable (ACE_NONBLOCK);
+    }
+  if (i < opt_nconnections)
+    return 0;
+
+  // Keep blasting data on all possible connections until this thread
+  // is canceled. If we manage to overrun the receiver on all sockets,
+  // sleep a bit for the receivers to catch up.
+  ACE_thread_t me = ACE_Thread::self ();
+  ACE_Thread_Manager *tm = ACE_Thread_Manager::instance ();
+  size_t send_cnt = ACE_OS::strlen (ACE_ALPHABET);
+  bool fail = false;
+  while (!tm->testcancel (me) && !fail)
+    {
+      bool sent_something = false;
+      for (i = 0; i < opt_nconnections; i++)
+        {
+          ssize_t cnt = socks[i].send (ACE_ALPHABET, send_cnt);
+          if (opt_debug)
+            ACE_DEBUG ((LM_DEBUG,
+                        ACE_TEXT ("(%t) h %d sent %b\n"),
+                        socks[i].get_handle(),
+                        cnt));
+          if (cnt > 0)
+            {
+              sent_something = true;
+              continue;
+            }
+          if (errno == EWOULDBLOCK)
+            continue;
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("(%t) %p; giving up\n"),
+                      ACE_TEXT ("sender")));
+          fail = true;
+          break;
+        }
+      if (!fail && !sent_something)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("(%t) Full sockets... pausing...\n")));
+          ACE_OS::sleep (1);
+          ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Resuming sending.\n")));
+        }
+    }
+
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Done sending.\n")));
+  for (i = 0; i < opt_nconnections; i++)
+    socks[i].close ();
+  return 0;
+}
+
+ACE_THR_FUNC_RETURN
+reactor_loop (void *p)
+{
+  ACE_Reactor *r = reinterpret_cast<ACE_Reactor *> (p);
+  int me = reactor_thread_nr++;
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Reactor loop %d starting...\n"), me));
+  if (me == 0)
+    r->owner (ACE_Thread::self ());
+  if (r->run_reactor_event_loop () == -1)
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), ACE_TEXT ("reactor")));
+  else
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) reactor thread %d ending\n"), me));
+  return 0;
+}
+
+void
+run (ACE_Reactor_Impl &ri, const ACE_TCHAR *what, bool tp = true)
+{
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting test with %s\n"), what));
+
+  ACE_Reactor r (&ri);
+  ACE_Thread_Manager *tm = ACE_Thread_Manager::instance ();
+  ACE_Acceptor<Read_Handler, ACE_SOCK_ACCEPTOR> acceptor;
+
+  // Bind acceptor to any port and then find out what the port was.
+  ACE_INET_Addr server_addr;
+  ACE_INET_Addr local_addr (ACE_sap_any_cast (const ACE_INET_Addr &));
+  if (acceptor.open (local_addr, &r) == -1
+      || acceptor.acceptor ().get_local_addr (server_addr) == -1)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("(%t) %p\n"),
+                  ACE_TEXT ("acceptor open")));
+      return;
+    }
+
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("(%t) starting server at port %d\n"),
+              server_addr.get_port_number ()));
+
+  reactor_thread_nr = 0;   // Reset for new set
+  if (-1 == tm->spawn_n (tp ? opt_reactor_threads : 1, reactor_loop, &r))
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("%p\n"),
+                  ACE_TEXT ("reactor thread spawn")));
+      acceptor.close();
+      return;
+    }
+
+  ACE_INET_Addr connection_addr (server_addr.get_port_number (),
+                                 ACE_DEFAULT_SERVER_HOST);
+
+  int sender_grp = tm->spawn (sender, &connection_addr);
+  if (-1 == sender_grp)
+    {
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("sender spawn")));
+    }
+  else
+    {
+      ACE_OS::sleep (opt_secs);
+      tm->cancel_grp (sender_grp);
+    }
+  r.end_reactor_event_loop ();
+
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("(%t) waiting for the test threads...\n")));
+  tm->wait ();
+}
+
+int
+run_main (int argc, ACE_TCHAR *argv[])
+{
+  ACE_START_TEST (ACE_TEXT ("Reactor_Fairness_Test"));
+
+  //FUZZ: disable check_for_lack_ACE_OS
+  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("c:s:t:d"), 1);
+  for (int c; (c = getopt ()) != -1; )
+  //FUZZ: enble check_for_lack_ACE_OS
+    switch (c)
+      {
+      case 'c':
+        opt_nconnections = ACE_OS::atoi (getopt.opt_arg ());
+        break;
+      case 's':
+        opt_secs = ACE_OS::atoi (getopt.opt_arg ());
+        break;
+      case 't':
+        opt_reactor_threads = ACE_OS::atoi (getopt.opt_arg ());
+        break;
+      case 'd':
+        opt_debug = 1;
+        break;
+      }
+
+  // Run the test once for each reactor type available.
+  int fails = 0;
+  results.reset (opt_nconnections);
+  {
+    ACE_Select_Reactor r;
+    run (r, ACE_TEXT ("Select Reactor"), false);  // No thread pool
+  }
+  fails += results.analyze_reports ();
+ 
+  results.reset (opt_nconnections);
+  {
+    ACE_TP_Reactor r;
+    run (r, ACE_TEXT ("TP Reactor"));
+  }
+  fails += results.analyze_reports ();
+
+#if defined (ACE_HAS_EVENT_POLL) || defined (ACE_HAS_DEV_POLL)
+  results.reset (opt_nconnections);
+  {
+    ACE_Dev_Poll_Reactor r;
+    run (r, ACE_TEXT ("Dev_Poll Reactor"));
+  }
+  fails += results.analyze_reports ();
+#endif /* ACE_HAS_EVENT_POLL || ACE_HAS_DEV_POLL */
+
+#if defined (ACE_WIN32)
+  results.reset (opt_nconnections);
+  {
+    ACE_WFMO_Reactor r;
+    run (r, ACE_TEXT ("WFMO Reactor"));
+  }
+  fails += results.analyze_reports ();
+#endif /* ACE_WIN32 */
+
+  ACE_END_TEST;
+  return fails;
+}
+
+#else
+int
+run_main (int, ACE_TCHAR *[])
+{
+  ACE_START_TEST (ACE_TEXT ("Reactor_Performance_Test"));
+
+  ACE_ERROR ((LM_INFO,
+              ACE_TEXT ("threads not supported on this platform\n")));
+
+  ACE_END_TEST;
+  return 0;
+}
+#endif /* ACE_HAS_THREADS */
diff --git a/tests/Reactor_Fairness_Test.h b/tests/Reactor_Fairness_Test.h
new file mode 100644
index 00000000000..6b8815ace11
--- /dev/null
+++ b/tests/Reactor_Fairness_Test.h
@@ -0,0 +1,49 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    tests
+//
+// = FILENAME
+//    Reactor_Fairness_Test.h
+//
+// = DESCRIPTION
+//    This file includes template class definitions for the
+//    Reactor_Fairness_Test.cpp program.  This class gets its own
+//    header file to work around AIX C++ compiler "features" related
+//    to template instantiation...
+//
+// = AUTHOR
+//    Steve Huston <shuston@riverace.com>
+//
+// ============================================================================
+
+#ifndef ACE_TESTS_REACTOR_FAIRNESS_TEST_H
+#define ACE_TESTS_REACTOR_FAIRNESS_TEST_H
+
+#include "ace/SOCK_Stream.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Svc_Handler.h"
+
+class Read_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+{
+  // = TITLE
+  //   Simple class for reading in the data
+public:
+  Read_Handler () : chunks_in (0) {}
+
+  virtual int handle_input (ACE_HANDLE h);
+  virtual int handle_close (ACE_HANDLE handle,
+                            ACE_Reactor_Mask close_mask);
+  // The Svc_Handler callbacks.
+
+private:
+  unsigned int chunks_in;
+};
+
+#endif /* ACE_TESTS_REACTOR_FAIRNESS_TEST_H */
diff --git a/tests/Reactor_Performance_Test.cpp b/tests/Reactor_Performance_Test.cpp
index bdb4e51cbac..975c8c34678 100644
--- a/tests/Reactor_Performance_Test.cpp
+++ b/tests/Reactor_Performance_Test.cpp
@@ -360,7 +360,8 @@ run_main (int argc, ACE_TCHAR *argv[])
   ACE_INET_Addr server_addr;
 
   // Bind acceptor to any port and then find out what the port was.
-  if (acceptor.open (ACE_sap_any_cast (const ACE_INET_Addr &)) == -1
+  ACE_INET_Addr local_addr (ACE_sap_any_cast (const ACE_INET_Addr &));
+  if (acceptor.open (local_addr) == -1
       || acceptor.acceptor ().get_local_addr (server_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("(%t) %p\n"),
diff --git a/tests/Recursive_Condition_Test.cpp b/tests/Recursive_Condition_Test.cpp
index 6786b478681..63360905348 100644
--- a/tests/Recursive_Condition_Test.cpp
+++ b/tests/Recursive_Condition_Test.cpp
@@ -11,8 +11,7 @@
 // = DESCRIPTION
 //      This test program validates the functionality of the
 //      ACE_Condition<ACE_Recursive_Thread_Mutex> template
-//      specialization when combined with the
-//      ACE_Thread_Timer_Queue_Adapter on Win32 and Posix pthreads.
+//      specialization.
 //
 // = AUTHOR
 //    Stephen Howard <stephen.e.howard@lmco.com> and
@@ -68,8 +67,9 @@ private:
 
 // These are for the basic functionality tests.
 ACE_SYNCH_RECURSIVE_MUTEX mutex_;
-ACE_SYNCH_RECURSIVE_CONDITION condition_(mutex_);
-// Test driver sets this to non-zero before spawning and to zero for waiter.
+ACE_Condition<ACE_SYNCH_RECURSIVE_MUTEX> condition_ (mutex_);
+// Test driver sets this to non-zero before spawning and to zero for
+// waiter.
 int protected_int = 0;
 
 static ACE_THR_FUNC_RETURN
@@ -247,7 +247,6 @@ run_main (int, ACE_TCHAR *[])
   ACE_START_TEST (ACE_TEXT ("Recursive_Condition_Test"));
 
 #if defined (ACE_HAS_THREADS)
-
   int status = 0;
 
   /* Test 1 - Simple test */
diff --git a/tests/Reference_Counted_Event_Handler_Test.cpp b/tests/Reference_Counted_Event_Handler_Test.cpp
index 43bddbfa1e7..014588b464c 100644
--- a/tests/Reference_Counted_Event_Handler_Test.cpp
+++ b/tests/Reference_Counted_Event_Handler_Test.cpp
@@ -1101,7 +1101,7 @@ run_main (int argc, ACE_TCHAR *argv[])
       ACE_UNUSED_ARG (test);
     }
 
-#endif /* ACE_HAS_DEV_POOL || ACE_HAS_EVENT_POLL */
+#endif /* ACE_HAS_DEV_POLL || ACE_HAS_EVENT_POLL */
 
   ACE_END_TEST;
 
diff --git a/tests/Thread_Attrs_Test.cpp b/tests/Thread_Attrs_Test.cpp
index 50a71bd806a..301d8923a4f 100644
--- a/tests/Thread_Attrs_Test.cpp
+++ b/tests/Thread_Attrs_Test.cpp
@@ -83,7 +83,11 @@ Stack_Size_Check::svc (void)
   my_size = this->stack_size_;
 #endif /* __USE_GNU */
 
-  if (my_size != this->stack_size_)
+  // The Posix docs say that the size set for the threads stack will be the
+  // *minimum* size allocated (the actual size may be bigger because of
+  // a) pagesize rounding, b) guardsize addition) so we can really only
+  // check if we have gotten *at least* what we asked for.
+  if (my_size < this->stack_size_)
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("%t: My stack size attr %B; expected %B\n"),
@@ -127,7 +131,7 @@ run_main (int, ACE_TCHAR *[])
 
   int status = 0;
 #if defined (ACE_HAS_THREADS)
-  Stack_Size_Check size_checker (42*1024);
+  Stack_Size_Check size_checker (40*1024);
   status = size_checker.open(0);
   if (status == 0)
     {
diff --git a/tests/Time_Value_Test.cpp b/tests/Time_Value_Test.cpp
index 008089d473c..1f136ead1bc 100644
--- a/tests/Time_Value_Test.cpp
+++ b/tests/Time_Value_Test.cpp
@@ -30,6 +30,9 @@ ACE_RCSID(tests, Time_Value_Test, "$Id$")
 
 #include "ace/Numeric_Limits.h"
 
+#ifdef ACE_HAS_CPP98_IOSTREAMS
+#include <sstream>
+#endif
 
 int
 run_main (int, ACE_TCHAR *[])
@@ -98,16 +101,9 @@ run_main (int, ACE_TCHAR *[])
   const time_t max_time_t = ACE_Numeric_Limits<time_t>::max ();
   const time_t min_time_t = ACE_Numeric_Limits<time_t>::min ();
 
-  // test results near limits
-  tv1.set ((max_time_t >> 1), 499999);
-  tv2.set ((-(max_time_t >> 1) << 1), -999998);
-  tv1 *= -2.0;
-  ACE_ASSERT (tv1 == tv2);
-  tv1.set (max_time_t >> 1, 499999);
-  tv2.set (((max_time_t >> 1) << 1), 999998);
-  tv1 *= 2.0;
-  ACE_ASSERT (tv1 == tv2);
-
+  // test protection against overflows
+  // ACE_ASSERT( ACE_Time_Value(max_time_t,ACE_ONE_SECOND_IN_USECS) != ACE_Time_Value(ACE_Numeric_Limits<time_t>::min()) );
+  
   // test saturated result
   tv1.set (max_time_t - 1, 499999);
   tv2.set (max_time_t, 999999);  // ACE_Time_Value::max_time
@@ -117,6 +113,16 @@ run_main (int, ACE_TCHAR *[])
   tv2.set (min_time_t, -999999);
   tv1 *= -10.0;
   ACE_ASSERT (tv1 == tv2);
+  
+  // test results near limits
+  tv1.set ((max_time_t >> 1), 499999);
+  tv2.set ((-(max_time_t >> 1) << 1), -999998);
+  tv1 *= -2.0;
+  ACE_ASSERT (tv1 == tv2);
+  tv1.set (max_time_t >> 1, 499999);
+  tv2.set (((max_time_t >> 1) << 1), 999998);
+  tv1 *= 2.0;
+  ACE_ASSERT (tv1 == tv2);
 
   // Test correct msec() convert; also checks for compile error reported in
   // Bugzilla 3336.
@@ -127,7 +133,7 @@ run_main (int, ACE_TCHAR *[])
     ACE_ERROR ((LM_ERROR,
                 ACE_TEXT ("msec test failed: %Q should be 42555\n"),
                 ms));
-  const ACE_Time_Value msec_test2 (42, 555000);
+  ACE_Time_Value const msec_test2 (42, 555000);
   ms = 0;
   msec_test2.msec (ms);
   if (ms != 42555)
@@ -135,6 +141,27 @@ run_main (int, ACE_TCHAR *[])
                 ACE_TEXT ("msec const test failed: %Q should be 42555\n"),
                 ms));
 
+#ifdef ACE_HAS_CPP98_IOSTREAMS
+  std::ostringstream ost;
+  ost << ACE_Time_Value(1);
+  ACE_ASSERT( ost.str() == "1" );
+  ost.str("");
+  ost << ACE_Time_Value(1,1);
+  ACE_ASSERT( ost.str() == "1.000001" );
+  ost.str("");
+  ost << ACE_Time_Value(-1,-1);
+  ACE_ASSERT( ost.str() == "-1.000001" );
+  ost.str(""); 
+  ost << ACE_Time_Value(0,1);
+  ACE_ASSERT( ost.str() == "0.000001" );
+  ost.str("");
+  ost << ACE_Time_Value(0,-1);
+  ACE_ASSERT( ost.str() == "-0.000001" );
+  ost.str("");
+  ost << ACE_Time_Value();
+  ACE_ASSERT( ost.str() == "0" );
+#endif
+                
   ACE_END_TEST;
 
   return ret;
diff --git a/tests/run_test.lst b/tests/run_test.lst
index d954a06fa19..6fcc855482f 100644
--- a/tests/run_test.lst
+++ b/tests/run_test.lst
@@ -33,6 +33,7 @@ Buffer_Stream_Test
 Bug_1576_Regression_Test
 Bug_1890_Regression_Test
 Bug_2368_Regression_Test: ALL !DISABLED
+Bug_2434_Regression_Test
 Bug_2497_Regression_Test
 Bug_2540_Regression_Test
 #Bug_2609_Regression_Test: !ST !ACE_FOR_TAO
@@ -160,6 +161,7 @@ Bug_3332_Regression_Test
 Reactor_Dispatch_Order_Test
 Reactor_Dispatch_Order_Test_Dev_Poll:
 Reactor_Exceptions_Test
+Reactor_Fairness_Test: !FIXED_BUGS_ONLY
 Reactor_Notify_Test: !ST !ACE_FOR_TAO
 Reactor_Notification_Queue_Test
 Reactor_Performance_Test: !ACE_FOR_TAO
diff --git a/tests/tests.mpc b/tests/tests.mpc
index 48032006dc6..8ee44a1a028 100644
--- a/tests/tests.mpc
+++ b/tests/tests.mpc
@@ -229,6 +229,13 @@ project(Bug_2368_Regression_Test) : acetest {
   }
 }
 
+project(Bug_2434_Regression_Test) : acetest {
+  exename = Bug_2434_Regression_Test
+  Source_Files {
+    Bug_2434_Regression_Test.cpp
+  }
+}
+
 project(Bug_2497_Regression_Test) : acetest {
   exename = Bug_2497_Regression_Test
   Source_Files {
@@ -369,9 +376,6 @@ project(Bug_3673_Regression_Test) : acetest {
 
 project(Bug_3709_Regression_Test) : acetest {
   exename = Bug_3709_Regression_Test
-  specific (vc71) {
-    requires += dummy_label
-  }
   Source_Files {
     Bug_3709_Regression_Test.cpp
   }
@@ -1142,6 +1146,13 @@ project(Reactor_Dispatch_Order_Test_Dev_Poll) : acetest {
   }
 }
 
+project(Reactor Fairness Test) : acetest {
+  exename = Reactor_Fairness_Test
+  Source_Files {
+    Reactor_Fairness_Test.cpp
+  }
+}
+
 project(Reactor Performance Test) : acetest {
   avoids += ace_for_tao
   exename = Reactor_Performance_Test