hguemar pushed to omniORB (epel7). "Update to 4.2.0"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 8 15:31:02 UTC 2015
>From a4bc3b5665bcf17018bad911995dd14a0a7eb959 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro at gmail.com>
Date: Fri, 9 May 2014 00:25:47 +0200
Subject: Update to 4.2.0
diff --git a/.gitignore b/.gitignore
index ed9dcd4..3909b09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/omniORB-4.1.6.tar.bz2
/omniORB-4.1.7.tar.bz2
+/omniORB-4.2.0.tar.bz2
diff --git a/omniORB-4.1.6-fsf-address.patch b/omniORB-4.1.6-fsf-address.patch
deleted file mode 100644
index 6eaaed1..0000000
--- a/omniORB-4.1.6-fsf-address.patch
+++ /dev/null
@@ -1,6257 +0,0 @@
-diff --git a/COPYING b/COPYING
-index ae3b531..e3f290f 100644
---- a/COPYING
-+++ b/COPYING
-@@ -2,7 +2,7 @@
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- USA.
-
- Also add information on how to contact you by electronic and paper mail.
-diff --git a/COPYING.LIB b/COPYING.LIB
-index 223ede7..580e988 100644
---- a/COPYING.LIB
-+++ b/COPYING.LIB
-@@ -2,7 +2,7 @@
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-@@ -485,7 +485,7 @@ convey the exclusion of warranty; and each file should have at least the
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Also add information on how to contact you by electronic and paper mail.
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index fd9d967..2ddf4ab 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -27,7 +27,7 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-diff --git a/bin/scripts/config.guess b/bin/scripts/config.guess
-index cd430f6..30971de 100755
---- a/bin/scripts/config.guess
-+++ b/bin/scripts/config.guess
-@@ -17,7 +17,7 @@ timestamp='2001-08-21'
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-diff --git a/bin/scripts/config.sub b/bin/scripts/config.sub
-index 12ebc78..550fe22 100755
---- a/bin/scripts/config.sub
-+++ b/bin/scripts/config.sub
-@@ -21,8 +21,8 @@ timestamp='2001-08-13'
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330,
--# Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor,
-+# Boston, MA 02110-1301, USA.
-
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-diff --git a/idl/omniConnectionData.idl b/idl/omniConnectionData.idl
-index af8816b..7356a61 100644
---- a/idl/omniConnectionData.idl
-+++ b/idl/omniConnectionData.idl
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/idl/omniTypedefs.idl b/idl/omniTypedefs.idl
-index cd5ce9a..5de351f 100644
---- a/idl/omniTypedefs.idl
-+++ b/idl/omniTypedefs.idl
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/BiDirPolicy.h b/include/omniORB4/BiDirPolicy.h
-index 7e928f3..13789c1 100644
---- a/include/omniORB4/BiDirPolicy.h
-+++ b/include/omniORB4/BiDirPolicy.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA.h b/include/omniORB4/CORBA.h
-index 3ddb0ab..a1bbbb8 100644
---- a/include/omniORB4/CORBA.h
-+++ b/include/omniORB4/CORBA.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_AbstractBase.h b/include/omniORB4/CORBA_AbstractBase.h
-index 184f850..7b4b23b 100644
---- a/include/omniORB4/CORBA_AbstractBase.h
-+++ b/include/omniORB4/CORBA_AbstractBase.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_Any.h b/include/omniORB4/CORBA_Any.h
-index 942aa36..46dad32 100644
---- a/include/omniORB4/CORBA_Any.h
-+++ b/include/omniORB4/CORBA_Any.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_Any_vartypes.h b/include/omniORB4/CORBA_Any_vartypes.h
-index 3720281..6747bbf 100644
---- a/include/omniORB4/CORBA_Any_vartypes.h
-+++ b/include/omniORB4/CORBA_Any_vartypes.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_BOA.h b/include/omniORB4/CORBA_BOA.h
-index 9e13391..62e1214 100644
---- a/include/omniORB4/CORBA_BOA.h
-+++ b/include/omniORB4/CORBA_BOA.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_Context.h b/include/omniORB4/CORBA_Context.h
-index 3361ebf..caf5a3f 100644
---- a/include/omniORB4/CORBA_Context.h
-+++ b/include/omniORB4/CORBA_Context.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_Current.h b/include/omniORB4/CORBA_Current.h
-index 9158f0b..fe32ca3 100644
---- a/include/omniORB4/CORBA_Current.h
-+++ b/include/omniORB4/CORBA_Current.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_DomainManager.h b/include/omniORB4/CORBA_DomainManager.h
-index 00021f5..3b13bbc 100644
---- a/include/omniORB4/CORBA_DomainManager.h
-+++ b/include/omniORB4/CORBA_DomainManager.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_Environment.h b/include/omniORB4/CORBA_Environment.h
-index 2659b9c..6c2a764 100644
---- a/include/omniORB4/CORBA_Environment.h
-+++ b/include/omniORB4/CORBA_Environment.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_Exception.h b/include/omniORB4/CORBA_Exception.h
-index ed3d28c..a1c709a 100644
---- a/include/omniORB4/CORBA_Exception.h
-+++ b/include/omniORB4/CORBA_Exception.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_ExceptionList.h b/include/omniORB4/CORBA_ExceptionList.h
-index 1196ccd..bfc0567 100644
---- a/include/omniORB4/CORBA_ExceptionList.h
-+++ b/include/omniORB4/CORBA_ExceptionList.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_Fixed.h b/include/omniORB4/CORBA_Fixed.h
-index 7a891ee..3a8f683 100644
---- a/include/omniORB4/CORBA_Fixed.h
-+++ b/include/omniORB4/CORBA_Fixed.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_LocalObject.h b/include/omniORB4/CORBA_LocalObject.h
-index a81982d..448f869 100644
---- a/include/omniORB4/CORBA_LocalObject.h
-+++ b/include/omniORB4/CORBA_LocalObject.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_LocalObject_vartypes.h b/include/omniORB4/CORBA_LocalObject_vartypes.h
-index 2e0786f..9b56378 100644
---- a/include/omniORB4/CORBA_LocalObject_vartypes.h
-+++ b/include/omniORB4/CORBA_LocalObject_vartypes.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
-
- /*
-diff --git a/include/omniORB4/CORBA_NamedValue.h b/include/omniORB4/CORBA_NamedValue.h
-index 042b69d..ed91c2d 100644
---- a/include/omniORB4/CORBA_NamedValue.h
-+++ b/include/omniORB4/CORBA_NamedValue.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_ORB.h b/include/omniORB4/CORBA_ORB.h
-index b385983..a6ca56b 100644
---- a/include/omniORB4/CORBA_ORB.h
-+++ b/include/omniORB4/CORBA_ORB.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_Object.h b/include/omniORB4/CORBA_Object.h
-index 04e4f40..ba7a4a3 100644
---- a/include/omniORB4/CORBA_Object.h
-+++ b/include/omniORB4/CORBA_Object.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_Object_vartypes.h b/include/omniORB4/CORBA_Object_vartypes.h
-index 15b6d5e..8c69c24 100644
---- a/include/omniORB4/CORBA_Object_vartypes.h
-+++ b/include/omniORB4/CORBA_Object_vartypes.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_Policy.h b/include/omniORB4/CORBA_Policy.h
-index 8d54fba..8987fc7 100644
---- a/include/omniORB4/CORBA_Policy.h
-+++ b/include/omniORB4/CORBA_Policy.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_Principal.h b/include/omniORB4/CORBA_Principal.h
-index 1eaa49f..5eb7d4b 100644
---- a/include/omniORB4/CORBA_Principal.h
-+++ b/include/omniORB4/CORBA_Principal.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_Request.h b/include/omniORB4/CORBA_Request.h
-index d7453c2..7910392 100644
---- a/include/omniORB4/CORBA_Request.h
-+++ b/include/omniORB4/CORBA_Request.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_ServerRequest.h b/include/omniORB4/CORBA_ServerRequest.h
-index b7cf77e..de7b135 100644
---- a/include/omniORB4/CORBA_ServerRequest.h
-+++ b/include/omniORB4/CORBA_ServerRequest.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_String.h b/include/omniORB4/CORBA_String.h
-index bb287ae..55cea17 100644
---- a/include/omniORB4/CORBA_String.h
-+++ b/include/omniORB4/CORBA_String.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_TypeCode.h b/include/omniORB4/CORBA_TypeCode.h
-index e8f6abe..8deea58 100644
---- a/include/omniORB4/CORBA_TypeCode.h
-+++ b/include/omniORB4/CORBA_TypeCode.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_TypeCode_member.h b/include/omniORB4/CORBA_TypeCode_member.h
-index df55d66..c25c0a8 100644
---- a/include/omniORB4/CORBA_TypeCode_member.h
-+++ b/include/omniORB4/CORBA_TypeCode_member.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_UnknownUserException.h b/include/omniORB4/CORBA_UnknownUserException.h
-index 5724e58..4b068e6 100644
---- a/include/omniORB4/CORBA_UnknownUserException.h
-+++ b/include/omniORB4/CORBA_UnknownUserException.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_ValueBase.h b/include/omniORB4/CORBA_ValueBase.h
-index f0cf885..16bad34 100644
---- a/include/omniORB4/CORBA_ValueBase.h
-+++ b/include/omniORB4/CORBA_ValueBase.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_ValueBase_vartypes.h b/include/omniORB4/CORBA_ValueBase_vartypes.h
-index df04c57..d1337e2 100644
---- a/include/omniORB4/CORBA_ValueBase_vartypes.h
-+++ b/include/omniORB4/CORBA_ValueBase_vartypes.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_basetypes.h b/include/omniORB4/CORBA_basetypes.h
-index a8f9871..f75a8da 100644
---- a/include/omniORB4/CORBA_basetypes.h
-+++ b/include/omniORB4/CORBA_basetypes.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_primitive_types.h b/include/omniORB4/CORBA_primitive_types.h
-index b2a4513..c88ac6e 100644
---- a/include/omniORB4/CORBA_primitive_types.h
-+++ b/include/omniORB4/CORBA_primitive_types.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_static_fns.h b/include/omniORB4/CORBA_static_fns.h
-index cc822f2..eccf9f5 100644
---- a/include/omniORB4/CORBA_static_fns.h
-+++ b/include/omniORB4/CORBA_static_fns.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_sysdep.h b/include/omniORB4/CORBA_sysdep.h
-index 3ff1f22..10874d9 100644
---- a/include/omniORB4/CORBA_sysdep.h
-+++ b/include/omniORB4/CORBA_sysdep.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_sysdep_auto.h b/include/omniORB4/CORBA_sysdep_auto.h
-index 1b7d79b..5b2aa3b 100644
---- a/include/omniORB4/CORBA_sysdep_auto.h
-+++ b/include/omniORB4/CORBA_sysdep_auto.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_sysdep_trad.h b/include/omniORB4/CORBA_sysdep_trad.h
-index 9a30252..89ee75d 100644
---- a/include/omniORB4/CORBA_sysdep_trad.h
-+++ b/include/omniORB4/CORBA_sysdep_trad.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/CORBA_vartypes.h b/include/omniORB4/CORBA_vartypes.h
-index 32d2b42..6e7ecdf 100644
---- a/include/omniORB4/CORBA_vartypes.h
-+++ b/include/omniORB4/CORBA_vartypes.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/GIOP.h b/include/omniORB4/GIOP.h
-index 507f9ee..3d4ea32 100644
---- a/include/omniORB4/GIOP.h
-+++ b/include/omniORB4/GIOP.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/IIOP.h b/include/omniORB4/IIOP.h
-index 9c43065..91d108f 100644
---- a/include/omniORB4/IIOP.h
-+++ b/include/omniORB4/IIOP.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/IOP.h b/include/omniORB4/IOP.h
-index 5743254..22581f5 100644
---- a/include/omniORB4/IOP.h
-+++ b/include/omniORB4/IOP.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/IOP_C.h b/include/omniORB4/IOP_C.h
-index 528d40c..f88e1f5 100644
---- a/include/omniORB4/IOP_C.h
-+++ b/include/omniORB4/IOP_C.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/IOP_S.h b/include/omniORB4/IOP_S.h
-index fa3de20..7114448 100644
---- a/include/omniORB4/IOP_S.h
-+++ b/include/omniORB4/IOP_S.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/anyStream.h b/include/omniORB4/anyStream.h
-index b74fab6..1c3742d 100644
---- a/include/omniORB4/anyStream.h
-+++ b/include/omniORB4/anyStream.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/boa.h b/include/omniORB4/boa.h
-index 6be126b..af7defc 100644
---- a/include/omniORB4/boa.h
-+++ b/include/omniORB4/boa.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/callDescriptor.h b/include/omniORB4/callDescriptor.h
-index 4c51f9b..1d7abd9 100644
---- a/include/omniORB4/callDescriptor.h
-+++ b/include/omniORB4/callDescriptor.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/callHandle.h b/include/omniORB4/callHandle.h
-index 68f4fea..78d12e4 100644
---- a/include/omniORB4/callHandle.h
-+++ b/include/omniORB4/callHandle.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/cdrStream.h b/include/omniORB4/cdrStream.h
-index 34d76f8..bdbadfb 100644
---- a/include/omniORB4/cdrStream.h
-+++ b/include/omniORB4/cdrStream.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/codeSets.h b/include/omniORB4/codeSets.h
-index 3f42ad4..744bab6 100644
---- a/include/omniORB4/codeSets.h
-+++ b/include/omniORB4/codeSets.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/corba_operators.h b/include/omniORB4/corba_operators.h
-index b3e8054..fed153b 100644
---- a/include/omniORB4/corba_operators.h
-+++ b/include/omniORB4/corba_operators.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/dynAny.h b/include/omniORB4/dynAny.h
-index 340ebff..ebcc6fc 100644
---- a/include/omniORB4/dynAny.h
-+++ b/include/omniORB4/dynAny.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/finalCleanup.h b/include/omniORB4/finalCleanup.h
-index 83dc51f..05ee18c 100644
---- a/include/omniORB4/finalCleanup.h
-+++ b/include/omniORB4/finalCleanup.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/fixed.h b/include/omniORB4/fixed.h
-index 6e88ba4..1f52f7e 100644
---- a/include/omniORB4/fixed.h
-+++ b/include/omniORB4/fixed.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/giopEndpoint.h b/include/omniORB4/giopEndpoint.h
-index 9f05b39..4791882 100644
---- a/include/omniORB4/giopEndpoint.h
-+++ b/include/omniORB4/giopEndpoint.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/GIOP_C.h b/include/omniORB4/internal/GIOP_C.h
-index 9c54c30..b6945c1 100644
---- a/include/omniORB4/internal/GIOP_C.h
-+++ b/include/omniORB4/internal/GIOP_C.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/GIOP_S.h b/include/omniORB4/internal/GIOP_S.h
-index f845760..33d6812 100644
---- a/include/omniORB4/internal/GIOP_S.h
-+++ b/include/omniORB4/internal/GIOP_S.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/SocketCollection.h b/include/omniORB4/internal/SocketCollection.h
-index 7342c70..d67b857 100644
---- a/include/omniORB4/internal/SocketCollection.h
-+++ b/include/omniORB4/internal/SocketCollection.h
-@@ -21,8 +21,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/anonObject.h b/include/omniORB4/internal/anonObject.h
-index 4f792bc..004cfdf 100644
---- a/include/omniORB4/internal/anonObject.h
-+++ b/include/omniORB4/internal/anonObject.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/codeSetUtil.h b/include/omniORB4/internal/codeSetUtil.h
-index c38952d..ffefbe0 100644
---- a/include/omniORB4/internal/codeSetUtil.h
-+++ b/include/omniORB4/internal/codeSetUtil.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/context.h b/include/omniORB4/internal/context.h
-index a66ff95..24767c7 100644
---- a/include/omniORB4/internal/context.h
-+++ b/include/omniORB4/internal/context.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/corbaBoa.h b/include/omniORB4/internal/corbaBoa.h
-index 995ff76..a0cc745 100644
---- a/include/omniORB4/internal/corbaBoa.h
-+++ b/include/omniORB4/internal/corbaBoa.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/corbaOrb.h b/include/omniORB4/internal/corbaOrb.h
-index ebe17cf..ea833b0 100644
---- a/include/omniORB4/internal/corbaOrb.h
-+++ b/include/omniORB4/internal/corbaOrb.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/deferredRequest.h b/include/omniORB4/internal/deferredRequest.h
-index f282a54..3fc0e4c 100644
---- a/include/omniORB4/internal/deferredRequest.h
-+++ b/include/omniORB4/internal/deferredRequest.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/dynAnyImpl.h b/include/omniORB4/internal/dynAnyImpl.h
-index 20c6120..9daff58 100644
---- a/include/omniORB4/internal/dynAnyImpl.h
-+++ b/include/omniORB4/internal/dynAnyImpl.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/dynamicImplementation.h b/include/omniORB4/internal/dynamicImplementation.h
-index 4d8900a..ed30dd7 100644
---- a/include/omniORB4/internal/dynamicImplementation.h
-+++ b/include/omniORB4/internal/dynamicImplementation.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/dynamicLib.h b/include/omniORB4/internal/dynamicLib.h
-index cad0268..ae46bd2 100644
---- a/include/omniORB4/internal/dynamicLib.h
-+++ b/include/omniORB4/internal/dynamicLib.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/excepthandler.h b/include/omniORB4/internal/excepthandler.h
-index 353af98..afb6947 100644
---- a/include/omniORB4/internal/excepthandler.h
-+++ b/include/omniORB4/internal/excepthandler.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/exceptiondefs.h b/include/omniORB4/internal/exceptiondefs.h
-index b74d50f..c148035 100644
---- a/include/omniORB4/internal/exceptiondefs.h
-+++ b/include/omniORB4/internal/exceptiondefs.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/giopBiDir.h b/include/omniORB4/internal/giopBiDir.h
-index fb1bf3b..04e04b0 100644
---- a/include/omniORB4/internal/giopBiDir.h
-+++ b/include/omniORB4/internal/giopBiDir.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/giopMonitor.h b/include/omniORB4/internal/giopMonitor.h
-index f269b51..d973ee1 100644
---- a/include/omniORB4/internal/giopMonitor.h
-+++ b/include/omniORB4/internal/giopMonitor.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/giopRendezvouser.h b/include/omniORB4/internal/giopRendezvouser.h
-index 7ecaef8..baa8162 100644
---- a/include/omniORB4/internal/giopRendezvouser.h
-+++ b/include/omniORB4/internal/giopRendezvouser.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/giopRope.h b/include/omniORB4/internal/giopRope.h
-index 702e626..f4b0631 100644
---- a/include/omniORB4/internal/giopRope.h
-+++ b/include/omniORB4/internal/giopRope.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/giopServer.h b/include/omniORB4/internal/giopServer.h
-index 0769f95..b7612bd 100644
---- a/include/omniORB4/internal/giopServer.h
-+++ b/include/omniORB4/internal/giopServer.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/giopStrand.h b/include/omniORB4/internal/giopStrand.h
-index dd3bb5e..381e60c 100644
---- a/include/omniORB4/internal/giopStrand.h
-+++ b/include/omniORB4/internal/giopStrand.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/giopStrandFlags.h b/include/omniORB4/internal/giopStrandFlags.h
-index 9c05a47..4271c23 100644
---- a/include/omniORB4/internal/giopStrandFlags.h
-+++ b/include/omniORB4/internal/giopStrandFlags.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/giopStream.h b/include/omniORB4/internal/giopStream.h
-index 4c11074..3ec2ace 100644
---- a/include/omniORB4/internal/giopStream.h
-+++ b/include/omniORB4/internal/giopStream.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/giopStreamImpl.h b/include/omniORB4/internal/giopStreamImpl.h
-index 4c83de8..a3b22d0 100644
---- a/include/omniORB4/internal/giopStreamImpl.h
-+++ b/include/omniORB4/internal/giopStreamImpl.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/giopWorker.h b/include/omniORB4/internal/giopWorker.h
-index bf9b81e..8c69208 100644
---- a/include/omniORB4/internal/giopWorker.h
-+++ b/include/omniORB4/internal/giopWorker.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/inProcessIdentity.h b/include/omniORB4/internal/inProcessIdentity.h
-index e8f1d18..59762c2 100644
---- a/include/omniORB4/internal/inProcessIdentity.h
-+++ b/include/omniORB4/internal/inProcessIdentity.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/initRefs.h b/include/omniORB4/internal/initRefs.h
-index dc2df26..2554902 100644
---- a/include/omniORB4/internal/initRefs.h
-+++ b/include/omniORB4/internal/initRefs.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/initialiser.h b/include/omniORB4/internal/initialiser.h
-index b525d37..4c944d7 100644
---- a/include/omniORB4/internal/initialiser.h
-+++ b/include/omniORB4/internal/initialiser.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/interceptors.h b/include/omniORB4/internal/interceptors.h
-index a840630..7241ba1 100644
---- a/include/omniORB4/internal/interceptors.h
-+++ b/include/omniORB4/internal/interceptors.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/invoker.h b/include/omniORB4/internal/invoker.h
-index 1f2541b..a445d66 100644
---- a/include/omniORB4/internal/invoker.h
-+++ b/include/omniORB4/internal/invoker.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/libcWrapper.h b/include/omniORB4/internal/libcWrapper.h
-index 9d6bc59..67f8c26 100644
---- a/include/omniORB4/internal/libcWrapper.h
-+++ b/include/omniORB4/internal/libcWrapper.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/localIdentity.h b/include/omniORB4/internal/localIdentity.h
-index e813014..392462f 100644
---- a/include/omniORB4/internal/localIdentity.h
-+++ b/include/omniORB4/internal/localIdentity.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/objectAdapter.h b/include/omniORB4/internal/objectAdapter.h
-index d6ab76e..6412a4d 100644
---- a/include/omniORB4/internal/objectAdapter.h
-+++ b/include/omniORB4/internal/objectAdapter.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/objectStub.h b/include/omniORB4/internal/objectStub.h
-index 0453fab..8718f78 100644
---- a/include/omniORB4/internal/objectStub.h
-+++ b/include/omniORB4/internal/objectStub.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/objectTable.h b/include/omniORB4/internal/objectTable.h
-index 85aa1a3..ac3dbe2 100644
---- a/include/omniORB4/internal/objectTable.h
-+++ b/include/omniORB4/internal/objectTable.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/omniCurrent.h b/include/omniORB4/internal/omniCurrent.h
-index f40ba84..c6b2642 100644
---- a/include/omniORB4/internal/omniCurrent.h
-+++ b/include/omniORB4/internal/omniCurrent.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/omniIdentity.h b/include/omniORB4/internal/omniIdentity.h
-index ae0aaa8..c05d1cf 100644
---- a/include/omniORB4/internal/omniIdentity.h
-+++ b/include/omniORB4/internal/omniIdentity.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/orbOptions.h b/include/omniORB4/internal/orbOptions.h
-index 4254a8c..365b4c0 100644
---- a/include/omniORB4/internal/orbOptions.h
-+++ b/include/omniORB4/internal/orbOptions.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/orbParameters.h b/include/omniORB4/internal/orbParameters.h
-index 9da5df8..49a35fd 100644
---- a/include/omniORB4/internal/orbParameters.h
-+++ b/include/omniORB4/internal/orbParameters.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/poacurrentimpl.h b/include/omniORB4/internal/poacurrentimpl.h
-index d6790da..62c9350 100644
---- a/include/omniORB4/internal/poacurrentimpl.h
-+++ b/include/omniORB4/internal/poacurrentimpl.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/poaimpl.h b/include/omniORB4/internal/poaimpl.h
-index cb31d41..89ba7f9 100644
---- a/include/omniORB4/internal/poaimpl.h
-+++ b/include/omniORB4/internal/poaimpl.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/poamanager.h b/include/omniORB4/internal/poamanager.h
-index c55c5c8..defc0d2 100644
---- a/include/omniORB4/internal/poamanager.h
-+++ b/include/omniORB4/internal/poamanager.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/pseudo.h b/include/omniORB4/internal/pseudo.h
-index 17b4251..f56760b 100644
---- a/include/omniORB4/internal/pseudo.h
-+++ b/include/omniORB4/internal/pseudo.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/remoteIdentity.h b/include/omniORB4/internal/remoteIdentity.h
-index c0c3ba0..5353381 100644
---- a/include/omniORB4/internal/remoteIdentity.h
-+++ b/include/omniORB4/internal/remoteIdentity.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/request.h b/include/omniORB4/internal/request.h
-index 1120290..56e0562 100644
---- a/include/omniORB4/internal/request.h
-+++ b/include/omniORB4/internal/request.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/rmutex.h b/include/omniORB4/internal/rmutex.h
-index caa1e6a..2088a15 100644
---- a/include/omniORB4/internal/rmutex.h
-+++ b/include/omniORB4/internal/rmutex.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/shutdownIdentity.h b/include/omniORB4/internal/shutdownIdentity.h
-index d1a1e4c..4f06dca 100644
---- a/include/omniORB4/internal/shutdownIdentity.h
-+++ b/include/omniORB4/internal/shutdownIdentity.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/tcParser.h b/include/omniORB4/internal/tcParser.h
-index 10f76e2..f53f2d1 100644
---- a/include/omniORB4/internal/tcParser.h
-+++ b/include/omniORB4/internal/tcParser.h
-@@ -21,8 +21,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/transportRules.h b/include/omniORB4/internal/transportRules.h
-index 39c3ccb..48e4b90 100644
---- a/include/omniORB4/internal/transportRules.h
-+++ b/include/omniORB4/internal/transportRules.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/typecode.h b/include/omniORB4/internal/typecode.h
-index 703b516..1f912e3 100644
---- a/include/omniORB4/internal/typecode.h
-+++ b/include/omniORB4/internal/typecode.h
-@@ -22,8 +22,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/unknownValue.h b/include/omniORB4/internal/unknownValue.h
-index f8b24db..2de348e 100644
---- a/include/omniORB4/internal/unknownValue.h
-+++ b/include/omniORB4/internal/unknownValue.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/internal/valueTrackerImpl.h b/include/omniORB4/internal/valueTrackerImpl.h
-index 19e8cae..8549d7c 100644
---- a/include/omniORB4/internal/valueTrackerImpl.h
-+++ b/include/omniORB4/internal/valueTrackerImpl.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/linkHacks.h b/include/omniORB4/linkHacks.h
-index f38815b..c43f460 100644
---- a/include/omniORB4/linkHacks.h
-+++ b/include/omniORB4/linkHacks.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/minorCode.h b/include/omniORB4/minorCode.h
-index 46ffd2a..3c45d62 100644
---- a/include/omniORB4/minorCode.h
-+++ b/include/omniORB4/minorCode.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/objTracker.h b/include/omniORB4/objTracker.h
-index a90c6a3..510ac40 100644
---- a/include/omniORB4/objTracker.h
-+++ b/include/omniORB4/objTracker.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/omniAsyncInvoker.h b/include/omniORB4/omniAsyncInvoker.h
-index a1a1ff7..2e7c423 100644
---- a/include/omniORB4/omniAsyncInvoker.h
-+++ b/include/omniORB4/omniAsyncInvoker.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/omniConnectionMgmt.h b/include/omniORB4/omniConnectionMgmt.h
-index 6e3d214..85b9fd6 100644
---- a/include/omniORB4/omniConnectionMgmt.h
-+++ b/include/omniORB4/omniConnectionMgmt.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- // Description:
- // Proprietary omniORB connection management API
-diff --git a/include/omniORB4/omniIOR.h b/include/omniORB4/omniIOR.h
-index 8787353..80facfa 100644
---- a/include/omniORB4/omniIOR.h
-+++ b/include/omniORB4/omniIOR.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/omniInterceptors.h b/include/omniORB4/omniInterceptors.h
-index 5801daf..72894b3 100644
---- a/include/omniORB4/omniInterceptors.h
-+++ b/include/omniORB4/omniInterceptors.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/omniInternal.h b/include/omniORB4/omniInternal.h
-index dc81d6e..9095678 100644
---- a/include/omniORB4/omniInternal.h
-+++ b/include/omniORB4/omniInternal.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/omniORB.h b/include/omniORB4/omniORB.h
-index 45ea0ab..9a998ff 100644
---- a/include/omniORB4/omniORB.h
-+++ b/include/omniORB4/omniORB.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/omniORBcompat.h b/include/omniORB4/omniORBcompat.h
-index 2b382e2..aa6bdac 100644
---- a/include/omniORB4/omniORBcompat.h
-+++ b/include/omniORB4/omniORBcompat.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/omniObjKey.h b/include/omniORB4/omniObjKey.h
-index 78a524d..b257d40 100644
---- a/include/omniORB4/omniObjKey.h
-+++ b/include/omniORB4/omniObjKey.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/omniObjRef.h b/include/omniORB4/omniObjRef.h
-index bf77b5b..5116407 100644
---- a/include/omniORB4/omniObjRef.h
-+++ b/include/omniORB4/omniObjRef.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/omniPolicy.h b/include/omniORB4/omniPolicy.h
-index 682fca2..8477e93 100644
---- a/include/omniORB4/omniPolicy.h
-+++ b/include/omniORB4/omniPolicy.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/omniServant.h b/include/omniORB4/omniServant.h
-index 97c0708..c4d32da 100644
---- a/include/omniORB4/omniServant.h
-+++ b/include/omniORB4/omniServant.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/omniServer.h b/include/omniORB4/omniServer.h
-index 2b9da88..e88e9f7 100644
---- a/include/omniORB4/omniServer.h
-+++ b/include/omniORB4/omniServer.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/omniTransport.h b/include/omniORB4/omniTransport.h
-index 83bdec2..41327a8 100644
---- a/include/omniORB4/omniTransport.h
-+++ b/include/omniORB4/omniTransport.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/omniURI.h b/include/omniORB4/omniURI.h
-index 74ee558..af76db6 100644
---- a/include/omniORB4/omniURI.h
-+++ b/include/omniORB4/omniURI.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/omniutilities.h b/include/omniORB4/omniutilities.h
-index fde7045..f4adec4 100644
---- a/include/omniORB4/omniutilities.h
-+++ b/include/omniORB4/omniutilities.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/optionalFeatures.h b/include/omniORB4/optionalFeatures.h
-index a70e439..52623f4 100644
---- a/include/omniORB4/optionalFeatures.h
-+++ b/include/omniORB4/optionalFeatures.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/poa.h b/include/omniORB4/poa.h
-index f6c06f2..40656c2 100644
---- a/include/omniORB4/poa.h
-+++ b/include/omniORB4/poa.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/poa_defs.h b/include/omniORB4/poa_defs.h
-index 6c650e2..6f20e83 100644
---- a/include/omniORB4/poa_defs.h
-+++ b/include/omniORB4/poa_defs.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/poa_poa.h b/include/omniORB4/poa_poa.h
-index 12b37d1..2a1b2ae 100644
---- a/include/omniORB4/poa_poa.h
-+++ b/include/omniORB4/poa_poa.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/proxyFactory.h b/include/omniORB4/proxyFactory.h
-index ff6ad43..e04f200 100644
---- a/include/omniORB4/proxyFactory.h
-+++ b/include/omniORB4/proxyFactory.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/seqTemplatedecls.h b/include/omniORB4/seqTemplatedecls.h
-index 6d6556e..c6d731f 100644
---- a/include/omniORB4/seqTemplatedecls.h
-+++ b/include/omniORB4/seqTemplatedecls.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/seqTemplatedefns.h b/include/omniORB4/seqTemplatedefns.h
-index 747292b..e58c02f 100644
---- a/include/omniORB4/seqTemplatedefns.h
-+++ b/include/omniORB4/seqTemplatedefns.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/sslContext.h b/include/omniORB4/sslContext.h
-index 416cf52..d90dc3e 100644
---- a/include/omniORB4/sslContext.h
-+++ b/include/omniORB4/sslContext.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/streamOperators.h b/include/omniORB4/streamOperators.h
-index a551187..ac7161f 100644
---- a/include/omniORB4/streamOperators.h
-+++ b/include/omniORB4/streamOperators.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/stringtypes.h b/include/omniORB4/stringtypes.h
-index c5ba408..0e44376 100644
---- a/include/omniORB4/stringtypes.h
-+++ b/include/omniORB4/stringtypes.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/templatedecls.h b/include/omniORB4/templatedecls.h
-index 820c40e..ab6f76f 100644
---- a/include/omniORB4/templatedecls.h
-+++ b/include/omniORB4/templatedecls.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/templatedefns.h b/include/omniORB4/templatedefns.h
-index 1ae019a..a2a0e02 100644
---- a/include/omniORB4/templatedefns.h
-+++ b/include/omniORB4/templatedefns.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/tracedthread.h b/include/omniORB4/tracedthread.h
-index 09a170a..ce39ab8 100644
---- a/include/omniORB4/tracedthread.h
-+++ b/include/omniORB4/tracedthread.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/userexception.h b/include/omniORB4/userexception.h
-index 6d7a3fa..1a042ae 100644
---- a/include/omniORB4/userexception.h
-+++ b/include/omniORB4/userexception.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/valueFactoryManager.h b/include/omniORB4/valueFactoryManager.h
-index 0337e22..7c41bd7 100644
---- a/include/omniORB4/valueFactoryManager.h
-+++ b/include/omniORB4/valueFactoryManager.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/valueTemplatedecls.h b/include/omniORB4/valueTemplatedecls.h
-index f0dea1a..db70681 100644
---- a/include/omniORB4/valueTemplatedecls.h
-+++ b/include/omniORB4/valueTemplatedecls.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/valueTemplatedefns.h b/include/omniORB4/valueTemplatedefns.h
-index f06eb5f..b6f5d9e 100644
---- a/include/omniORB4/valueTemplatedefns.h
-+++ b/include/omniORB4/valueTemplatedefns.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/valueType.h b/include/omniORB4/valueType.h
-index 7d1dafb..259f915 100644
---- a/include/omniORB4/valueType.h
-+++ b/include/omniORB4/valueType.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniORB4/wstringtypes.h b/include/omniORB4/wstringtypes.h
-index 6acc485..5a798d2 100644
---- a/include/omniORB4/wstringtypes.h
-+++ b/include/omniORB4/wstringtypes.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/include/omniconfig.h b/include/omniconfig.h
-index 0deeb89..bff24cf 100644
---- a/include/omniconfig.h
-+++ b/include/omniconfig.h
-@@ -19,8 +19,8 @@
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-- * 02111-1307, USA
-+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+ * 02110-1301, USA
- *
- *
- * Description:
-diff --git a/include/omniconfig.h.in b/include/omniconfig.h.in
-index 14f76a9..20402e6 100644
---- a/include/omniconfig.h.in
-+++ b/include/omniconfig.h.in
-@@ -19,8 +19,8 @@
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-- * 02111-1307, USA
-+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+ * 02110-1301, USA
- *
- *
- * Description:
-diff --git a/include/omnithread.h b/include/omnithread.h
-index 6767249..d62a2f3 100644
---- a/include/omnithread.h
-+++ b/include/omnithread.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
-
- //
-diff --git a/include/omnithread/mach.h b/include/omnithread/mach.h
-index 483f600..a8e5dd5 100644
---- a/include/omnithread/mach.h
-+++ b/include/omnithread/mach.h
-@@ -17,8 +17,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // OMNI thread implementation classes for posix threads
-diff --git a/include/omnithread/nt.h b/include/omnithread/nt.h
-index cd2519e..9b6660c 100644
---- a/include/omnithread/nt.h
-+++ b/include/omnithread/nt.h
-@@ -18,8 +18,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // OMNI thread implementation classes for NT threads.
-diff --git a/include/omnithread/posix.h b/include/omnithread/posix.h
-index c5fa4ac..4a4223f 100644
---- a/include/omnithread/posix.h
-+++ b/include/omnithread/posix.h
-@@ -18,8 +18,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // OMNI thread implementation classes for posix threads
-diff --git a/include/omnithread/pthread_nt.h b/include/omnithread/pthread_nt.h
-index cf3d879..0a95fc8 100644
---- a/include/omnithread/pthread_nt.h
-+++ b/include/omnithread/pthread_nt.h
-@@ -17,8 +17,8 @@
-
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free
-- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-- 02111-1307, USA
-+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+ 02110-1301, USA
-
- Posix Threads implementation for Windows NT, version 4.0
- */
-diff --git a/include/omnithread/solaris.h b/include/omnithread/solaris.h
-index aaef036..e0f6f78 100644
---- a/include/omnithread/solaris.h
-+++ b/include/omnithread/solaris.h
-@@ -17,8 +17,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- // OMNI thread implementation classes for solaris threads.
- //
-diff --git a/src/appl/omniMapper/omniMapper.cc b/src/appl/omniMapper/omniMapper.cc
-index e35847d..22a78c6 100644
---- a/src/appl/omniMapper/omniMapper.cc
-+++ b/src/appl/omniMapper/omniMapper.cc
-@@ -18,8 +18,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
-
- // $Id: omniMapper.cc 5133 2005-01-06 23:11:24Z dgrisby $
- // $Log$
-diff --git a/src/appl/omniNames/BindingIterator_i.h b/src/appl/omniNames/BindingIterator_i.h
-index 4ab27ac..173124f 100644
---- a/src/appl/omniNames/BindingIterator_i.h
-+++ b/src/appl/omniNames/BindingIterator_i.h
-@@ -18,7 +18,7 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- // USA.
- //
-
-diff --git a/src/appl/omniNames/INSMapper.h b/src/appl/omniNames/INSMapper.h
-index 603fe89..544a748 100644
---- a/src/appl/omniNames/INSMapper.h
-+++ b/src/appl/omniNames/INSMapper.h
-@@ -19,7 +19,7 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- // USA.
- //
-
-diff --git a/src/appl/omniNames/NamingContext_i.cc b/src/appl/omniNames/NamingContext_i.cc
-index c48163e..64a9175 100644
---- a/src/appl/omniNames/NamingContext_i.cc
-+++ b/src/appl/omniNames/NamingContext_i.cc
-@@ -19,7 +19,7 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- // USA.
- //
-
-diff --git a/src/appl/omniNames/NamingContext_i.h b/src/appl/omniNames/NamingContext_i.h
-index 12c6d34..a60d1e4 100644
---- a/src/appl/omniNames/NamingContext_i.h
-+++ b/src/appl/omniNames/NamingContext_i.h
-@@ -19,7 +19,7 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- // USA.
- //
-
-diff --git a/src/appl/omniNames/ObjectBinding.h b/src/appl/omniNames/ObjectBinding.h
-index 188623a..bb90e29 100644
---- a/src/appl/omniNames/ObjectBinding.h
-+++ b/src/appl/omniNames/ObjectBinding.h
-@@ -18,7 +18,7 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- // USA.
- //
-
-diff --git a/src/appl/omniNames/ReadersWritersLock.h b/src/appl/omniNames/ReadersWritersLock.h
-index fa7314a..c079502 100644
---- a/src/appl/omniNames/ReadersWritersLock.h
-+++ b/src/appl/omniNames/ReadersWritersLock.h
-@@ -18,7 +18,7 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- // USA.
- //
-
-diff --git a/src/appl/omniNames/log.cc b/src/appl/omniNames/log.cc
-index d3bc287..5a3544b 100644
---- a/src/appl/omniNames/log.cc
-+++ b/src/appl/omniNames/log.cc
-@@ -19,7 +19,7 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- // USA.
- //
-
-diff --git a/src/appl/omniNames/log.h b/src/appl/omniNames/log.h
-index 7dec6ca..fb10484 100644
---- a/src/appl/omniNames/log.h
-+++ b/src/appl/omniNames/log.h
-@@ -19,7 +19,7 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- // USA.
- //
-
-diff --git a/src/appl/omniNames/omniNames.cc b/src/appl/omniNames/omniNames.cc
-index a2facd5..1701536 100644
---- a/src/appl/omniNames/omniNames.cc
-+++ b/src/appl/omniNames/omniNames.cc
-@@ -19,7 +19,7 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- // USA.
- //
-
-diff --git a/src/appl/omniNames/omniNames.h b/src/appl/omniNames/omniNames.h
-index e8b15e1..7a05ac3 100644
---- a/src/appl/omniNames/omniNames.h
-+++ b/src/appl/omniNames/omniNames.h
-@@ -19,7 +19,7 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- // USA.
- //
-
-diff --git a/src/appl/omniNames/omniNamesWin.cc b/src/appl/omniNames/omniNamesWin.cc
-index 6cd8ab7..ddd6765 100644
---- a/src/appl/omniNames/omniNamesWin.cc
-+++ b/src/appl/omniNames/omniNamesWin.cc
-@@ -18,7 +18,7 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- // USA.
- //
-
-diff --git a/src/appl/utils/catior/catior.cc b/src/appl/utils/catior/catior.cc
-index 784b1a2..77d2945 100644
---- a/src/appl/utils/catior/catior.cc
-+++ b/src/appl/utils/catior/catior.cc
-@@ -18,7 +18,7 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- // USA.
- //
- //
-diff --git a/src/appl/utils/convertior/convertior.cc b/src/appl/utils/convertior/convertior.cc
-index bde9a69..4f336bf 100644
---- a/src/appl/utils/convertior/convertior.cc
-+++ b/src/appl/utils/convertior/convertior.cc
-@@ -18,7 +18,7 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- // USA.
- //
- //
-diff --git a/src/appl/utils/genior/genior.cc b/src/appl/utils/genior/genior.cc
-index 0627920..a219d9d 100644
---- a/src/appl/utils/genior/genior.cc
-+++ b/src/appl/utils/genior/genior.cc
-@@ -18,7 +18,7 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- // USA.
- //
- //
-diff --git a/src/appl/utils/nameclt/nameclt.cc b/src/appl/utils/nameclt/nameclt.cc
-index 3113480..d919f33 100644
---- a/src/appl/utils/nameclt/nameclt.cc
-+++ b/src/appl/utils/nameclt/nameclt.cc
-@@ -18,7 +18,7 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- // USA.
- //
-
-diff --git a/src/lib/omniORB/codesets/cs-037.cc b/src/lib/omniORB/codesets/cs-037.cc
-index bcac381..776b546 100644
---- a/src/lib/omniORB/codesets/cs-037.cc
-+++ b/src/lib/omniORB/codesets/cs-037.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/codesets/cs-500.cc b/src/lib/omniORB/codesets/cs-500.cc
-index 727e0a2..3626fae 100644
---- a/src/lib/omniORB/codesets/cs-500.cc
-+++ b/src/lib/omniORB/codesets/cs-500.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/codesets/cs-EDF-4.cc b/src/lib/omniORB/codesets/cs-EDF-4.cc
-index a96dc9e..67871c3 100644
---- a/src/lib/omniORB/codesets/cs-EDF-4.cc
-+++ b/src/lib/omniORB/codesets/cs-EDF-4.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/codesets/cs-UCS-4.cc b/src/lib/omniORB/codesets/cs-UCS-4.cc
-index 6a98aa7..e35ccaa 100644
---- a/src/lib/omniORB/codesets/cs-UCS-4.cc
-+++ b/src/lib/omniORB/codesets/cs-UCS-4.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/codesets/omniCodeSets.cc b/src/lib/omniORB/codesets/omniCodeSets.cc
-index bae2960..d56e2e9 100644
---- a/src/lib/omniORB/codesets/omniCodeSets.cc
-+++ b/src/lib/omniORB/codesets/omniCodeSets.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/connections/dataStub.cc b/src/lib/omniORB/connections/dataStub.cc
-index a378e34..cc109c2 100644
---- a/src/lib/omniORB/connections/dataStub.cc
-+++ b/src/lib/omniORB/connections/dataStub.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- // Description:
- // omniidl generated stub file
-diff --git a/src/lib/omniORB/connections/omniConnectionMgmt.cc b/src/lib/omniORB/connections/omniConnectionMgmt.cc
-index cb70cd9..30e0f84 100644
---- a/src/lib/omniORB/connections/omniConnectionMgmt.cc
-+++ b/src/lib/omniORB/connections/omniConnectionMgmt.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- // Description:
- // Proprietary omniORB connection management API
-diff --git a/src/lib/omniORB/dynamic/Namingdynstub.cc b/src/lib/omniORB/dynamic/Namingdynstub.cc
-index 43ded94..028815c 100644
---- a/src/lib/omniORB/dynamic/Namingdynstub.cc
-+++ b/src/lib/omniORB/dynamic/Namingdynstub.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/abstractBase.cc b/src/lib/omniORB/dynamic/abstractBase.cc
-index 96ec451..85a9ee7 100644
---- a/src/lib/omniORB/dynamic/abstractBase.cc
-+++ b/src/lib/omniORB/dynamic/abstractBase.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/any.cc b/src/lib/omniORB/dynamic/any.cc
-index 3de09d7..bb1ceec 100644
---- a/src/lib/omniORB/dynamic/any.cc
-+++ b/src/lib/omniORB/dynamic/any.cc
-@@ -22,8 +22,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/anyStream.cc b/src/lib/omniORB/dynamic/anyStream.cc
-index 7321658..c655bf3 100644
---- a/src/lib/omniORB/dynamic/anyStream.cc
-+++ b/src/lib/omniORB/dynamic/anyStream.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/bootstrapdynstub.cc b/src/lib/omniORB/dynamic/bootstrapdynstub.cc
-index 97f85cc..58d5b80 100644
---- a/src/lib/omniORB/dynamic/bootstrapdynstub.cc
-+++ b/src/lib/omniORB/dynamic/bootstrapdynstub.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/boxes.cc b/src/lib/omniORB/dynamic/boxes.cc
-index 869f2db..87333c7 100644
---- a/src/lib/omniORB/dynamic/boxes.cc
-+++ b/src/lib/omniORB/dynamic/boxes.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
-
- #include <omniORB4/CORBA.h>
-diff --git a/src/lib/omniORB/dynamic/constants.cc b/src/lib/omniORB/dynamic/constants.cc
-index 39e99b4..ab744ae 100644
---- a/src/lib/omniORB/dynamic/constants.cc
-+++ b/src/lib/omniORB/dynamic/constants.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/context.cc b/src/lib/omniORB/dynamic/context.cc
-index f03fbff..6fb5dd0 100644
---- a/src/lib/omniORB/dynamic/context.cc
-+++ b/src/lib/omniORB/dynamic/context.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/contextList.cc b/src/lib/omniORB/dynamic/contextList.cc
-index f212bd9..b1ab5a4 100644
---- a/src/lib/omniORB/dynamic/contextList.cc
-+++ b/src/lib/omniORB/dynamic/contextList.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/corbaidldynstub.cc b/src/lib/omniORB/dynamic/corbaidldynstub.cc
-index 1a3e39d..0a57510 100644
---- a/src/lib/omniORB/dynamic/corbaidldynstub.cc
-+++ b/src/lib/omniORB/dynamic/corbaidldynstub.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/corbaidlstub.cc b/src/lib/omniORB/dynamic/corbaidlstub.cc
-index d4a5228..d7cc20e 100644
---- a/src/lib/omniORB/dynamic/corbaidlstub.cc
-+++ b/src/lib/omniORB/dynamic/corbaidlstub.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/deferredRequest.cc b/src/lib/omniORB/dynamic/deferredRequest.cc
-index 824a02b..cf72a8c 100644
---- a/src/lib/omniORB/dynamic/deferredRequest.cc
-+++ b/src/lib/omniORB/dynamic/deferredRequest.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/dynAny.cc b/src/lib/omniORB/dynamic/dynAny.cc
-index 868dc95..68b2192 100644
---- a/src/lib/omniORB/dynamic/dynAny.cc
-+++ b/src/lib/omniORB/dynamic/dynAny.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/dynAnyNil.cc b/src/lib/omniORB/dynamic/dynAnyNil.cc
-index b621853..e531c60 100644
---- a/src/lib/omniORB/dynamic/dynAnyNil.cc
-+++ b/src/lib/omniORB/dynamic/dynAnyNil.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/dynException.cc b/src/lib/omniORB/dynamic/dynException.cc
-index c9bf945..1e54af2 100644
---- a/src/lib/omniORB/dynamic/dynException.cc
-+++ b/src/lib/omniORB/dynamic/dynException.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/dynamicImplementation.cc b/src/lib/omniORB/dynamic/dynamicImplementation.cc
-index bbf9901..cb4dbe0 100644
---- a/src/lib/omniORB/dynamic/dynamicImplementation.cc
-+++ b/src/lib/omniORB/dynamic/dynamicImplementation.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/dynamicLib.cc b/src/lib/omniORB/dynamic/dynamicLib.cc
-index 7c8046b..7ff1aa6 100644
---- a/src/lib/omniORB/dynamic/dynamicLib.cc
-+++ b/src/lib/omniORB/dynamic/dynamicLib.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/environment.cc b/src/lib/omniORB/dynamic/environment.cc
-index 84145d5..53e6d59 100644
---- a/src/lib/omniORB/dynamic/environment.cc
-+++ b/src/lib/omniORB/dynamic/environment.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/exceptionList.cc b/src/lib/omniORB/dynamic/exceptionList.cc
-index c998b1b..70545dd 100644
---- a/src/lib/omniORB/dynamic/exceptionList.cc
-+++ b/src/lib/omniORB/dynamic/exceptionList.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/ir.cc b/src/lib/omniORB/dynamic/ir.cc
-index be845d6..1a29c6f 100644
---- a/src/lib/omniORB/dynamic/ir.cc
-+++ b/src/lib/omniORB/dynamic/ir.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/irdynstub.cc b/src/lib/omniORB/dynamic/irdynstub.cc
-index b8db0a5..b7d3105 100644
---- a/src/lib/omniORB/dynamic/irdynstub.cc
-+++ b/src/lib/omniORB/dynamic/irdynstub.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/irstub.cc b/src/lib/omniORB/dynamic/irstub.cc
-index e957fff..2894144 100644
---- a/src/lib/omniORB/dynamic/irstub.cc
-+++ b/src/lib/omniORB/dynamic/irstub.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/namedValue.cc b/src/lib/omniORB/dynamic/namedValue.cc
-index 49db3af..4b2f482 100644
---- a/src/lib/omniORB/dynamic/namedValue.cc
-+++ b/src/lib/omniORB/dynamic/namedValue.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/nvList.cc b/src/lib/omniORB/dynamic/nvList.cc
-index 0d5b176..0f1bbc7 100644
---- a/src/lib/omniORB/dynamic/nvList.cc
-+++ b/src/lib/omniORB/dynamic/nvList.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/omniTypedefs.cc b/src/lib/omniORB/dynamic/omniTypedefs.cc
-index 1bedf4d..2dd622b 100644
---- a/src/lib/omniORB/dynamic/omniTypedefs.cc
-+++ b/src/lib/omniORB/dynamic/omniTypedefs.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
-
- #define USE_core_stub_in_nt_dll
-diff --git a/src/lib/omniORB/dynamic/orbMultiRequest.cc b/src/lib/omniORB/dynamic/orbMultiRequest.cc
-index fb63995..bd9986e 100644
---- a/src/lib/omniORB/dynamic/orbMultiRequest.cc
-+++ b/src/lib/omniORB/dynamic/orbMultiRequest.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/poastub.cc b/src/lib/omniORB/dynamic/poastub.cc
-index b4ced90..48ee7cc 100644
---- a/src/lib/omniORB/dynamic/poastub.cc
-+++ b/src/lib/omniORB/dynamic/poastub.cc
-@@ -21,8 +21,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- // Description:
- //
-diff --git a/src/lib/omniORB/dynamic/policy.cc b/src/lib/omniORB/dynamic/policy.cc
-index 0f7ae05..a1d2f06 100644
---- a/src/lib/omniORB/dynamic/policy.cc
-+++ b/src/lib/omniORB/dynamic/policy.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/pseudoBase.cc b/src/lib/omniORB/dynamic/pseudoBase.cc
-index edf9cb1..7934707 100644
---- a/src/lib/omniORB/dynamic/pseudoBase.cc
-+++ b/src/lib/omniORB/dynamic/pseudoBase.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/request.cc b/src/lib/omniORB/dynamic/request.cc
-index 839f41b..f34043b 100644
---- a/src/lib/omniORB/dynamic/request.cc
-+++ b/src/lib/omniORB/dynamic/request.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/serverRequest.cc b/src/lib/omniORB/dynamic/serverRequest.cc
-index 0a575a8..bcc1410 100644
---- a/src/lib/omniORB/dynamic/serverRequest.cc
-+++ b/src/lib/omniORB/dynamic/serverRequest.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/tcParser.cc b/src/lib/omniORB/dynamic/tcParser.cc
-index 0be03b7..9920a22 100644
---- a/src/lib/omniORB/dynamic/tcParser.cc
-+++ b/src/lib/omniORB/dynamic/tcParser.cc
-@@ -21,8 +21,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/typecode.cc b/src/lib/omniORB/dynamic/typecode.cc
-index b5ee74e..5d0ea46 100644
---- a/src/lib/omniORB/dynamic/typecode.cc
-+++ b/src/lib/omniORB/dynamic/typecode.cc
-@@ -21,8 +21,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/unknownUserExn.cc b/src/lib/omniORB/dynamic/unknownUserExn.cc
-index 5e45d6b..b2b5efd 100644
---- a/src/lib/omniORB/dynamic/unknownUserExn.cc
-+++ b/src/lib/omniORB/dynamic/unknownUserExn.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/unknownValue.cc b/src/lib/omniORB/dynamic/unknownValue.cc
-index 728d63b..950ccde 100644
---- a/src/lib/omniORB/dynamic/unknownValue.cc
-+++ b/src/lib/omniORB/dynamic/unknownValue.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/valueBase.cc b/src/lib/omniORB/dynamic/valueBase.cc
-index bffc6e6..2cf29f0 100644
---- a/src/lib/omniORB/dynamic/valueBase.cc
-+++ b/src/lib/omniORB/dynamic/valueBase.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/valueFactory.cc b/src/lib/omniORB/dynamic/valueFactory.cc
-index aba73a1..2860281 100644
---- a/src/lib/omniORB/dynamic/valueFactory.cc
-+++ b/src/lib/omniORB/dynamic/valueFactory.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/valueTracker.cc b/src/lib/omniORB/dynamic/valueTracker.cc
-index 86d5356..2492b00 100644
---- a/src/lib/omniORB/dynamic/valueTracker.cc
-+++ b/src/lib/omniORB/dynamic/valueTracker.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/dynamic/valueType.cc b/src/lib/omniORB/dynamic/valueType.cc
-index bab9d49..942d842 100644
---- a/src/lib/omniORB/dynamic/valueType.cc
-+++ b/src/lib/omniORB/dynamic/valueType.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/omniidl_be/cxx/__init__.py b/src/lib/omniORB/omniidl_be/cxx/__init__.py
-index b153b5e..b1a6b15 100644
---- a/src/lib/omniORB/omniidl_be/cxx/__init__.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/__init__.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/ast.py b/src/lib/omniORB/omniidl_be/cxx/ast.py
-index e1c8564..66585e4 100644
---- a/src/lib/omniORB/omniidl_be/cxx/ast.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/ast.py
-@@ -19,8 +19,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/call.py b/src/lib/omniORB/omniidl_be/cxx/call.py
-index 10fec73..374b14a 100644
---- a/src/lib/omniORB/omniidl_be/cxx/call.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/call.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- # Produce local callback functions
-diff --git a/src/lib/omniORB/omniidl_be/cxx/config.py b/src/lib/omniORB/omniidl_be/cxx/config.py
-index 7c72644..d4414ab 100644
---- a/src/lib/omniORB/omniidl_be/cxx/config.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/config.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/cxx.py b/src/lib/omniORB/omniidl_be/cxx/cxx.py
-index 0d92e68..17bae84 100644
---- a/src/lib/omniORB/omniidl_be/cxx/cxx.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/cxx.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/descriptor.py b/src/lib/omniORB/omniidl_be/cxx/descriptor.py
-index 581aef5..0f3a3b9 100644
---- a/src/lib/omniORB/omniidl_be/cxx/descriptor.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/descriptor.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- # Produce internal descriptors
-diff --git a/src/lib/omniORB/omniidl_be/cxx/dynskel/__init__.py b/src/lib/omniORB/omniidl_be/cxx/dynskel/__init__.py
-index 9d90d93..6c617b9 100644
---- a/src/lib/omniORB/omniidl_be/cxx/dynskel/__init__.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/dynskel/__init__.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/dynskel/main.py b/src/lib/omniORB/omniidl_be/cxx/dynskel/main.py
-index f5442da..c9cea18 100644
---- a/src/lib/omniORB/omniidl_be/cxx/dynskel/main.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/dynskel/main.py
-@@ -21,8 +21,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/dynskel/tcstring.py b/src/lib/omniORB/omniidl_be/cxx/dynskel/tcstring.py
-index 3bb0376..1383653 100644
---- a/src/lib/omniORB/omniidl_be/cxx/dynskel/tcstring.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/dynskel/tcstring.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/dynskel/template.py b/src/lib/omniORB/omniidl_be/cxx/dynskel/template.py
-index 9672ade..bf60d64 100644
---- a/src/lib/omniORB/omniidl_be/cxx/dynskel/template.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/dynskel/template.py
-@@ -21,8 +21,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/dynskel/typecode.py b/src/lib/omniORB/omniidl_be/cxx/dynskel/typecode.py
-index fd98b2c..678f5c3 100644
---- a/src/lib/omniORB/omniidl_be/cxx/dynskel/typecode.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/dynskel/typecode.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/header/__init__.py b/src/lib/omniORB/omniidl_be/cxx/header/__init__.py
-index ce711dc..36ca8f7 100644
---- a/src/lib/omniORB/omniidl_be/cxx/header/__init__.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/header/__init__.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/header/defs.py b/src/lib/omniORB/omniidl_be/cxx/header/defs.py
-index 4dccc37..9db60ff 100644
---- a/src/lib/omniORB/omniidl_be/cxx/header/defs.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/header/defs.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/header/forward.py b/src/lib/omniORB/omniidl_be/cxx/header/forward.py
-index c2b041b..d0df5d4 100644
---- a/src/lib/omniORB/omniidl_be/cxx/header/forward.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/header/forward.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/header/marshal.py b/src/lib/omniORB/omniidl_be/cxx/header/marshal.py
-index 9847008..d6cacfa 100644
---- a/src/lib/omniORB/omniidl_be/cxx/header/marshal.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/header/marshal.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/header/obv.py b/src/lib/omniORB/omniidl_be/cxx/header/obv.py
-index 7690d77..45df72c 100644
---- a/src/lib/omniORB/omniidl_be/cxx/header/obv.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/header/obv.py
-@@ -19,8 +19,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/header/opers.py b/src/lib/omniORB/omniidl_be/cxx/header/opers.py
-index 0d4ec57..ca62413 100644
---- a/src/lib/omniORB/omniidl_be/cxx/header/opers.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/header/opers.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/header/poa.py b/src/lib/omniORB/omniidl_be/cxx/header/poa.py
-index 84b0d01..706251f 100644
---- a/src/lib/omniORB/omniidl_be/cxx/header/poa.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/header/poa.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/header/tcstring.py b/src/lib/omniORB/omniidl_be/cxx/header/tcstring.py
-index cec6fc8..1ecc0cc 100644
---- a/src/lib/omniORB/omniidl_be/cxx/header/tcstring.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/header/tcstring.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/header/template.py b/src/lib/omniORB/omniidl_be/cxx/header/template.py
-index fd8d5a4..a60b639 100644
---- a/src/lib/omniORB/omniidl_be/cxx/header/template.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/header/template.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/header/tie.py b/src/lib/omniORB/omniidl_be/cxx/header/tie.py
-index 95bc682..7111794 100644
---- a/src/lib/omniORB/omniidl_be/cxx/header/tie.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/header/tie.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/id.py b/src/lib/omniORB/omniidl_be/cxx/id.py
-index a2ee344..1d32735 100644
---- a/src/lib/omniORB/omniidl_be/cxx/id.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/id.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/iface.py b/src/lib/omniORB/omniidl_be/cxx/iface.py
-index 2053bf1..b43c6ca 100644
---- a/src/lib/omniORB/omniidl_be/cxx/iface.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/iface.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/impl/__init__.py b/src/lib/omniORB/omniidl_be/cxx/impl/__init__.py
-index 4a2a4ea..2dc6d5f 100644
---- a/src/lib/omniORB/omniidl_be/cxx/impl/__init__.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/impl/__init__.py
-@@ -19,8 +19,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/impl/main.py b/src/lib/omniORB/omniidl_be/cxx/impl/main.py
-index 5cb3f97..7c6de25 100644
---- a/src/lib/omniORB/omniidl_be/cxx/impl/main.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/impl/main.py
-@@ -19,8 +19,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/impl/template.py b/src/lib/omniORB/omniidl_be/cxx/impl/template.py
-index 3f0120d..ed1b7ae 100644
---- a/src/lib/omniORB/omniidl_be/cxx/impl/template.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/impl/template.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/mapping.py b/src/lib/omniORB/omniidl_be/cxx/mapping.py
-index 866a937..3683efa 100644
---- a/src/lib/omniORB/omniidl_be/cxx/mapping.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/mapping.py
-@@ -19,8 +19,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- # Abstract base class for C++ type mappings
-diff --git a/src/lib/omniORB/omniidl_be/cxx/output.py b/src/lib/omniORB/omniidl_be/cxx/output.py
-index 452538e..214cfd1 100644
---- a/src/lib/omniORB/omniidl_be/cxx/output.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/output.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/skel/__init__.py b/src/lib/omniORB/omniidl_be/cxx/skel/__init__.py
-index af6f05c..49c1a92 100644
---- a/src/lib/omniORB/omniidl_be/cxx/skel/__init__.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/skel/__init__.py
-@@ -19,8 +19,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/skel/main.py b/src/lib/omniORB/omniidl_be/cxx/skel/main.py
-index a75ccba..9adb18e 100644
---- a/src/lib/omniORB/omniidl_be/cxx/skel/main.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/skel/main.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/skel/mangler.py b/src/lib/omniORB/omniidl_be/cxx/skel/mangler.py
-index 8ea9106..4fe4ba4 100644
---- a/src/lib/omniORB/omniidl_be/cxx/skel/mangler.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/skel/mangler.py
-@@ -19,8 +19,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- # Produce mangled names for types and operation signatures
-diff --git a/src/lib/omniORB/omniidl_be/cxx/skel/poa.py b/src/lib/omniORB/omniidl_be/cxx/skel/poa.py
-index 8aeaaec..0f9ac25 100644
---- a/src/lib/omniORB/omniidl_be/cxx/skel/poa.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/skel/poa.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/skel/template.py b/src/lib/omniORB/omniidl_be/cxx/skel/template.py
-index e470cda..eed9283 100644
---- a/src/lib/omniORB/omniidl_be/cxx/skel/template.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/skel/template.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/skutil.py b/src/lib/omniORB/omniidl_be/cxx/skutil.py
-index ff7fd7a..89ac559 100644
---- a/src/lib/omniORB/omniidl_be/cxx/skutil.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/skutil.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/support.py b/src/lib/omniORB/omniidl_be/cxx/support.py
-index 9924260..69b0f82 100644
---- a/src/lib/omniORB/omniidl_be/cxx/support.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/support.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/tools/genIDL b/src/lib/omniORB/omniidl_be/cxx/tools/genIDL
-index 623425b..4853635 100755
---- a/src/lib/omniORB/omniidl_be/cxx/tools/genIDL
-+++ b/src/lib/omniORB/omniidl_be/cxx/tools/genIDL
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/tools/pretty b/src/lib/omniORB/omniidl_be/cxx/tools/pretty
-index 617c0f4..712a688 100755
---- a/src/lib/omniORB/omniidl_be/cxx/tools/pretty
-+++ b/src/lib/omniORB/omniidl_be/cxx/tools/pretty
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/types.py b/src/lib/omniORB/omniidl_be/cxx/types.py
-index 11901ac..d496f22 100644
---- a/src/lib/omniORB/omniidl_be/cxx/types.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/types.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/util.py b/src/lib/omniORB/omniidl_be/cxx/util.py
-index f251f41..5e43caa 100644
---- a/src/lib/omniORB/omniidl_be/cxx/util.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/util.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/lib/omniORB/omniidl_be/cxx/value.py b/src/lib/omniORB/omniidl_be/cxx/value.py
-index 18bc46a..31f87e0 100644
---- a/src/lib/omniORB/omniidl_be/cxx/value.py
-+++ b/src/lib/omniORB/omniidl_be/cxx/value.py
-@@ -19,8 +19,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- # Implementation of ValueType / ValueBox mapping
-diff --git a/src/lib/omniORB/orbcore/GIOP_C.cc b/src/lib/omniORB/orbcore/GIOP_C.cc
-index dac56aa..f892a0c 100644
---- a/src/lib/omniORB/orbcore/GIOP_C.cc
-+++ b/src/lib/omniORB/orbcore/GIOP_C.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/GIOP_S.cc b/src/lib/omniORB/orbcore/GIOP_S.cc
-index df0507f..c5d2f22 100644
---- a/src/lib/omniORB/orbcore/GIOP_S.cc
-+++ b/src/lib/omniORB/orbcore/GIOP_S.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/Namingstub.cc b/src/lib/omniORB/orbcore/Namingstub.cc
-index 496835b..102988b 100644
---- a/src/lib/omniORB/orbcore/Namingstub.cc
-+++ b/src/lib/omniORB/orbcore/Namingstub.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/SocketCollection.cc b/src/lib/omniORB/orbcore/SocketCollection.cc
-index 43665bc..9b8bf57 100644
---- a/src/lib/omniORB/orbcore/SocketCollection.cc
-+++ b/src/lib/omniORB/orbcore/SocketCollection.cc
-@@ -21,8 +21,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/anonObject.cc b/src/lib/omniORB/orbcore/anonObject.cc
-index f3a55df..0e3aff3 100644
---- a/src/lib/omniORB/orbcore/anonObject.cc
-+++ b/src/lib/omniORB/orbcore/anonObject.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/bootstrapstub.cc b/src/lib/omniORB/orbcore/bootstrapstub.cc
-index 69a42b9..828471c 100644
---- a/src/lib/omniORB/orbcore/bootstrapstub.cc
-+++ b/src/lib/omniORB/orbcore/bootstrapstub.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/callDescriptor.cc b/src/lib/omniORB/orbcore/callDescriptor.cc
-index 8eb9ebc..7590a37 100644
---- a/src/lib/omniORB/orbcore/callDescriptor.cc
-+++ b/src/lib/omniORB/orbcore/callDescriptor.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/callHandle.cc b/src/lib/omniORB/orbcore/callHandle.cc
-index 20e4622..ac8ba12 100644
---- a/src/lib/omniORB/orbcore/callHandle.cc
-+++ b/src/lib/omniORB/orbcore/callHandle.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/cdrMemoryStream.cc b/src/lib/omniORB/orbcore/cdrMemoryStream.cc
-index 4ff7ae8..f480489 100644
---- a/src/lib/omniORB/orbcore/cdrMemoryStream.cc
-+++ b/src/lib/omniORB/orbcore/cdrMemoryStream.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/cdrStream.cc b/src/lib/omniORB/orbcore/cdrStream.cc
-index 95abde1..08b8360 100644
---- a/src/lib/omniORB/orbcore/cdrStream.cc
-+++ b/src/lib/omniORB/orbcore/cdrStream.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/cdrStreamAdapter.cc b/src/lib/omniORB/orbcore/cdrStreamAdapter.cc
-index dc68fdf..380d4b9 100644
---- a/src/lib/omniORB/orbcore/cdrStreamAdapter.cc
-+++ b/src/lib/omniORB/orbcore/cdrStreamAdapter.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/cdrValueChunkStream.cc b/src/lib/omniORB/orbcore/cdrValueChunkStream.cc
-index 91c9b27..f9acaac 100644
---- a/src/lib/omniORB/orbcore/cdrValueChunkStream.cc
-+++ b/src/lib/omniORB/orbcore/cdrValueChunkStream.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/codeSets.cc b/src/lib/omniORB/orbcore/codeSets.cc
-index 7569613..9384ea5 100644
---- a/src/lib/omniORB/orbcore/codeSets.cc
-+++ b/src/lib/omniORB/orbcore/codeSets.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/constants.cc b/src/lib/omniORB/orbcore/constants.cc
-index 97375da..d8ce4cf 100644
---- a/src/lib/omniORB/orbcore/constants.cc
-+++ b/src/lib/omniORB/orbcore/constants.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/corbaBoa.cc b/src/lib/omniORB/orbcore/corbaBoa.cc
-index 37dfbc3..61a0bcb 100644
---- a/src/lib/omniORB/orbcore/corbaBoa.cc
-+++ b/src/lib/omniORB/orbcore/corbaBoa.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/corbaFixed.cc b/src/lib/omniORB/orbcore/corbaFixed.cc
-index eabf4f0..eada0e5 100644
---- a/src/lib/omniORB/orbcore/corbaFixed.cc
-+++ b/src/lib/omniORB/orbcore/corbaFixed.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/corbaObject.cc b/src/lib/omniORB/orbcore/corbaObject.cc
-index 4831ddf..69d03ac 100644
---- a/src/lib/omniORB/orbcore/corbaObject.cc
-+++ b/src/lib/omniORB/orbcore/corbaObject.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- // Description:
- // Implementation of the CORBA::Object interface.
-diff --git a/src/lib/omniORB/orbcore/corbaOrb.cc b/src/lib/omniORB/orbcore/corbaOrb.cc
-index 5ed98e3..e9b2698 100644
---- a/src/lib/omniORB/orbcore/corbaOrb.cc
-+++ b/src/lib/omniORB/orbcore/corbaOrb.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/corbaString.cc b/src/lib/omniORB/orbcore/corbaString.cc
-index 0165e9e..ef15500 100644
---- a/src/lib/omniORB/orbcore/corbaString.cc
-+++ b/src/lib/omniORB/orbcore/corbaString.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/corbaWString.cc b/src/lib/omniORB/orbcore/corbaWString.cc
-index 020d194..5c5bde1 100644
---- a/src/lib/omniORB/orbcore/corbaWString.cc
-+++ b/src/lib/omniORB/orbcore/corbaWString.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/cs-16bit.cc b/src/lib/omniORB/orbcore/cs-16bit.cc
-index 553de02..3b78988 100644
---- a/src/lib/omniORB/orbcore/cs-16bit.cc
-+++ b/src/lib/omniORB/orbcore/cs-16bit.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/cs-8859-1.cc b/src/lib/omniORB/orbcore/cs-8859-1.cc
-index 116e571..9cf3ac0 100644
---- a/src/lib/omniORB/orbcore/cs-8859-1.cc
-+++ b/src/lib/omniORB/orbcore/cs-8859-1.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/cs-8bit.cc b/src/lib/omniORB/orbcore/cs-8bit.cc
-index add5cdb..3cd3315 100644
---- a/src/lib/omniORB/orbcore/cs-8bit.cc
-+++ b/src/lib/omniORB/orbcore/cs-8bit.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/cs-UTF-16.cc b/src/lib/omniORB/orbcore/cs-UTF-16.cc
-index ff5809d..fcd33d5 100644
---- a/src/lib/omniORB/orbcore/cs-UTF-16.cc
-+++ b/src/lib/omniORB/orbcore/cs-UTF-16.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/cs-UTF-8.cc b/src/lib/omniORB/orbcore/cs-UTF-8.cc
-index 10e9014..7969329 100644
---- a/src/lib/omniORB/orbcore/cs-UTF-8.cc
-+++ b/src/lib/omniORB/orbcore/cs-UTF-8.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/current.cc b/src/lib/omniORB/orbcore/current.cc
-index 0c946f0..bc11cd6 100644
---- a/src/lib/omniORB/orbcore/current.cc
-+++ b/src/lib/omniORB/orbcore/current.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/dynamicLib.cc b/src/lib/omniORB/orbcore/dynamicLib.cc
-index ca2ca96..71bb27b 100644
---- a/src/lib/omniORB/orbcore/dynamicLib.cc
-+++ b/src/lib/omniORB/orbcore/dynamicLib.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/exception.cc b/src/lib/omniORB/orbcore/exception.cc
-index 2a8e5d2..1109266 100644
---- a/src/lib/omniORB/orbcore/exception.cc
-+++ b/src/lib/omniORB/orbcore/exception.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/exceptn.cc b/src/lib/omniORB/orbcore/exceptn.cc
-index a5e52db..f4140f9 100644
---- a/src/lib/omniORB/orbcore/exceptn.cc
-+++ b/src/lib/omniORB/orbcore/exceptn.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/giopBiDir.cc b/src/lib/omniORB/orbcore/giopBiDir.cc
-index 2448d4e..afef704 100644
---- a/src/lib/omniORB/orbcore/giopBiDir.cc
-+++ b/src/lib/omniORB/orbcore/giopBiDir.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/giopEndpoint.cc b/src/lib/omniORB/orbcore/giopEndpoint.cc
-index e195ed7..bd1dad5 100644
---- a/src/lib/omniORB/orbcore/giopEndpoint.cc
-+++ b/src/lib/omniORB/orbcore/giopEndpoint.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/giopImpl10.cc b/src/lib/omniORB/orbcore/giopImpl10.cc
-index 9c112e5..2c0c8be 100644
---- a/src/lib/omniORB/orbcore/giopImpl10.cc
-+++ b/src/lib/omniORB/orbcore/giopImpl10.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/giopImpl11.cc b/src/lib/omniORB/orbcore/giopImpl11.cc
-index 556a5fe..83a1d57 100644
---- a/src/lib/omniORB/orbcore/giopImpl11.cc
-+++ b/src/lib/omniORB/orbcore/giopImpl11.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/giopImpl12.cc b/src/lib/omniORB/orbcore/giopImpl12.cc
-index 9ce0605..515a21e 100644
---- a/src/lib/omniORB/orbcore/giopImpl12.cc
-+++ b/src/lib/omniORB/orbcore/giopImpl12.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/giopMonitor.cc b/src/lib/omniORB/orbcore/giopMonitor.cc
-index 135c7b5..ca84e2a 100644
---- a/src/lib/omniORB/orbcore/giopMonitor.cc
-+++ b/src/lib/omniORB/orbcore/giopMonitor.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/giopRendezvouser.cc b/src/lib/omniORB/orbcore/giopRendezvouser.cc
-index a22c025..6d2fe89 100644
---- a/src/lib/omniORB/orbcore/giopRendezvouser.cc
-+++ b/src/lib/omniORB/orbcore/giopRendezvouser.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/giopRope.cc b/src/lib/omniORB/orbcore/giopRope.cc
-index c337e33..741d447 100644
---- a/src/lib/omniORB/orbcore/giopRope.cc
-+++ b/src/lib/omniORB/orbcore/giopRope.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/giopServer.cc b/src/lib/omniORB/orbcore/giopServer.cc
-index d6783a8..3293f0f 100644
---- a/src/lib/omniORB/orbcore/giopServer.cc
-+++ b/src/lib/omniORB/orbcore/giopServer.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/giopStrand.cc b/src/lib/omniORB/orbcore/giopStrand.cc
-index 24f052c..7f0c0e4 100644
---- a/src/lib/omniORB/orbcore/giopStrand.cc
-+++ b/src/lib/omniORB/orbcore/giopStrand.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/giopStream.cc b/src/lib/omniORB/orbcore/giopStream.cc
-index 2bc8f86..5e9233c 100644
---- a/src/lib/omniORB/orbcore/giopStream.cc
-+++ b/src/lib/omniORB/orbcore/giopStream.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/giopStreamImpl.cc b/src/lib/omniORB/orbcore/giopStreamImpl.cc
-index 1112b42..918d3d1 100644
---- a/src/lib/omniORB/orbcore/giopStreamImpl.cc
-+++ b/src/lib/omniORB/orbcore/giopStreamImpl.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/giopWorker.cc b/src/lib/omniORB/orbcore/giopWorker.cc
-index ae7e488..e862d0a 100644
---- a/src/lib/omniORB/orbcore/giopWorker.cc
-+++ b/src/lib/omniORB/orbcore/giopWorker.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/inProcessIdentity.cc b/src/lib/omniORB/orbcore/inProcessIdentity.cc
-index 6cfc61e..034a448 100644
---- a/src/lib/omniORB/orbcore/inProcessIdentity.cc
-+++ b/src/lib/omniORB/orbcore/inProcessIdentity.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/initRefs.cc b/src/lib/omniORB/orbcore/initRefs.cc
-index f6a9cb0..55f6c78 100644
---- a/src/lib/omniORB/orbcore/initRefs.cc
-+++ b/src/lib/omniORB/orbcore/initRefs.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/interceptors.cc b/src/lib/omniORB/orbcore/interceptors.cc
-index b28c4a0..3d2e8b4 100644
---- a/src/lib/omniORB/orbcore/interceptors.cc
-+++ b/src/lib/omniORB/orbcore/interceptors.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/invoker.cc b/src/lib/omniORB/orbcore/invoker.cc
-index f56cf50..9f069c2 100644
---- a/src/lib/omniORB/orbcore/invoker.cc
-+++ b/src/lib/omniORB/orbcore/invoker.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/ior.cc b/src/lib/omniORB/orbcore/ior.cc
-index 9733ff9..4403e08 100644
---- a/src/lib/omniORB/orbcore/ior.cc
-+++ b/src/lib/omniORB/orbcore/ior.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/libcWrapper.cc b/src/lib/omniORB/orbcore/libcWrapper.cc
-index 55c6788..8bad7e9 100644
---- a/src/lib/omniORB/orbcore/libcWrapper.cc
-+++ b/src/lib/omniORB/orbcore/libcWrapper.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/localIdentity.cc b/src/lib/omniORB/orbcore/localIdentity.cc
-index c413cf7..d3e12f9 100644
---- a/src/lib/omniORB/orbcore/localIdentity.cc
-+++ b/src/lib/omniORB/orbcore/localIdentity.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/localObject.cc b/src/lib/omniORB/orbcore/localObject.cc
-index 04b1b22..b141b90 100644
---- a/src/lib/omniORB/orbcore/localObject.cc
-+++ b/src/lib/omniORB/orbcore/localObject.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/logIOstream.cc b/src/lib/omniORB/orbcore/logIOstream.cc
-index 812a12c..1f729df 100644
---- a/src/lib/omniORB/orbcore/logIOstream.cc
-+++ b/src/lib/omniORB/orbcore/logIOstream.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/minorCode.cc b/src/lib/omniORB/orbcore/minorCode.cc
-index 385e99d..36cd5c2 100644
---- a/src/lib/omniORB/orbcore/minorCode.cc
-+++ b/src/lib/omniORB/orbcore/minorCode.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/msvcdllstub.cc b/src/lib/omniORB/orbcore/msvcdllstub.cc
-index 7f07b2e..73ee804 100644
---- a/src/lib/omniORB/orbcore/msvcdllstub.cc
-+++ b/src/lib/omniORB/orbcore/msvcdllstub.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/objectAdapter.cc b/src/lib/omniORB/orbcore/objectAdapter.cc
-index ec21fe3..3eececb 100644
---- a/src/lib/omniORB/orbcore/objectAdapter.cc
-+++ b/src/lib/omniORB/orbcore/objectAdapter.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/objectStub.cc b/src/lib/omniORB/orbcore/objectStub.cc
-index 0e16d11..91c0bbe 100644
---- a/src/lib/omniORB/orbcore/objectStub.cc
-+++ b/src/lib/omniORB/orbcore/objectStub.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/omniIOR.cc b/src/lib/omniORB/orbcore/omniIOR.cc
-index f401e91..44a18b6 100644
---- a/src/lib/omniORB/orbcore/omniIOR.cc
-+++ b/src/lib/omniORB/orbcore/omniIOR.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/omniIdentity.cc b/src/lib/omniORB/orbcore/omniIdentity.cc
-index 15c5129..c26730f 100644
---- a/src/lib/omniORB/orbcore/omniIdentity.cc
-+++ b/src/lib/omniORB/orbcore/omniIdentity.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/omniInternal.cc b/src/lib/omniORB/orbcore/omniInternal.cc
-index 5a23515..834f4c3 100644
---- a/src/lib/omniORB/orbcore/omniInternal.cc
-+++ b/src/lib/omniORB/orbcore/omniInternal.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/omniORB.cc b/src/lib/omniORB/orbcore/omniORB.cc
-index 1afb6ac..009e778 100644
---- a/src/lib/omniORB/orbcore/omniORB.cc
-+++ b/src/lib/omniORB/orbcore/omniORB.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/omniObjRef.cc b/src/lib/omniORB/orbcore/omniObjRef.cc
-index 0197f98..725cbc6 100644
---- a/src/lib/omniORB/orbcore/omniObjRef.cc
-+++ b/src/lib/omniORB/orbcore/omniObjRef.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/omniPolicy.cc b/src/lib/omniORB/orbcore/omniPolicy.cc
-index 9a7e79e..27d2f11 100644
---- a/src/lib/omniORB/orbcore/omniPolicy.cc
-+++ b/src/lib/omniORB/orbcore/omniPolicy.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/omniServant.cc b/src/lib/omniORB/orbcore/omniServant.cc
-index 63e4287..1571f4c 100644
---- a/src/lib/omniORB/orbcore/omniServant.cc
-+++ b/src/lib/omniORB/orbcore/omniServant.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/omniTransport.cc b/src/lib/omniORB/orbcore/omniTransport.cc
-index 3f5d45d..d5f1c7b 100644
---- a/src/lib/omniORB/orbcore/omniTransport.cc
-+++ b/src/lib/omniORB/orbcore/omniTransport.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/orbOptions.cc b/src/lib/omniORB/orbcore/orbOptions.cc
-index 1b0a1cf..1ad2025 100644
---- a/src/lib/omniORB/orbcore/orbOptions.cc
-+++ b/src/lib/omniORB/orbcore/orbOptions.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/orbOptionsFile.cc b/src/lib/omniORB/orbcore/orbOptionsFile.cc
-index 7d83449..3da6f16 100644
---- a/src/lib/omniORB/orbcore/orbOptionsFile.cc
-+++ b/src/lib/omniORB/orbcore/orbOptionsFile.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/orbOptionsReg.cc b/src/lib/omniORB/orbcore/orbOptionsReg.cc
-index e26c0a5..6afd130 100644
---- a/src/lib/omniORB/orbcore/orbOptionsReg.cc
-+++ b/src/lib/omniORB/orbcore/orbOptionsReg.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/poa.cc b/src/lib/omniORB/orbcore/poa.cc
-index 71f4097..dc16927 100644
---- a/src/lib/omniORB/orbcore/poa.cc
-+++ b/src/lib/omniORB/orbcore/poa.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/poamanager.cc b/src/lib/omniORB/orbcore/poamanager.cc
-index f282a1f..8b1fe09 100644
---- a/src/lib/omniORB/orbcore/poamanager.cc
-+++ b/src/lib/omniORB/orbcore/poamanager.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/poastubs.cc b/src/lib/omniORB/orbcore/poastubs.cc
-index c1c52d5..c3e5710 100644
---- a/src/lib/omniORB/orbcore/poastubs.cc
-+++ b/src/lib/omniORB/orbcore/poastubs.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/policy.cc b/src/lib/omniORB/orbcore/policy.cc
-index 2988e81..fc6da06 100644
---- a/src/lib/omniORB/orbcore/policy.cc
-+++ b/src/lib/omniORB/orbcore/policy.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/portableserver.cc b/src/lib/omniORB/orbcore/portableserver.cc
-index c842422..d8d1bb2 100644
---- a/src/lib/omniORB/orbcore/portableserver.cc
-+++ b/src/lib/omniORB/orbcore/portableserver.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/proxyFactory.cc b/src/lib/omniORB/orbcore/proxyFactory.cc
-index 4dcb8a8..1ba4a89 100644
---- a/src/lib/omniORB/orbcore/proxyFactory.cc
-+++ b/src/lib/omniORB/orbcore/proxyFactory.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/remoteIdentity.cc b/src/lib/omniORB/orbcore/remoteIdentity.cc
-index 2e5ad90..192f2c0 100644
---- a/src/lib/omniORB/orbcore/remoteIdentity.cc
-+++ b/src/lib/omniORB/orbcore/remoteIdentity.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/rmutex.cc b/src/lib/omniORB/orbcore/rmutex.cc
-index 28921df..5de36a0 100644
---- a/src/lib/omniORB/orbcore/rmutex.cc
-+++ b/src/lib/omniORB/orbcore/rmutex.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/shutdownIdentity.cc b/src/lib/omniORB/orbcore/shutdownIdentity.cc
-index e2ad5ae..f343ddf 100644
---- a/src/lib/omniORB/orbcore/shutdownIdentity.cc
-+++ b/src/lib/omniORB/orbcore/shutdownIdentity.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/ssl/msvcdllstub.cc b/src/lib/omniORB/orbcore/ssl/msvcdllstub.cc
-index 7f07b2e..73ee804 100644
---- a/src/lib/omniORB/orbcore/ssl/msvcdllstub.cc
-+++ b/src/lib/omniORB/orbcore/ssl/msvcdllstub.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/ssl/sslActive.cc b/src/lib/omniORB/orbcore/ssl/sslActive.cc
-index cabd76b..2acf1b8 100644
---- a/src/lib/omniORB/orbcore/ssl/sslActive.cc
-+++ b/src/lib/omniORB/orbcore/ssl/sslActive.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/ssl/sslAddress.cc b/src/lib/omniORB/orbcore/ssl/sslAddress.cc
-index 1b40f24..2dbac2e 100644
---- a/src/lib/omniORB/orbcore/ssl/sslAddress.cc
-+++ b/src/lib/omniORB/orbcore/ssl/sslAddress.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/ssl/sslAddress.h b/src/lib/omniORB/orbcore/ssl/sslAddress.h
-index d068baf..4a36ee2 100644
---- a/src/lib/omniORB/orbcore/ssl/sslAddress.h
-+++ b/src/lib/omniORB/orbcore/ssl/sslAddress.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/ssl/sslConnection.cc b/src/lib/omniORB/orbcore/ssl/sslConnection.cc
-index 5f32193..4aabdde 100644
---- a/src/lib/omniORB/orbcore/ssl/sslConnection.cc
-+++ b/src/lib/omniORB/orbcore/ssl/sslConnection.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/ssl/sslConnection.h b/src/lib/omniORB/orbcore/ssl/sslConnection.h
-index 23405af..9afd244 100644
---- a/src/lib/omniORB/orbcore/ssl/sslConnection.h
-+++ b/src/lib/omniORB/orbcore/ssl/sslConnection.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/ssl/sslContext.cc b/src/lib/omniORB/orbcore/ssl/sslContext.cc
-index 471bcc6..4a146a9 100644
---- a/src/lib/omniORB/orbcore/ssl/sslContext.cc
-+++ b/src/lib/omniORB/orbcore/ssl/sslContext.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/ssl/sslEndpoint.cc b/src/lib/omniORB/orbcore/ssl/sslEndpoint.cc
-index c048359..759eeb3 100644
---- a/src/lib/omniORB/orbcore/ssl/sslEndpoint.cc
-+++ b/src/lib/omniORB/orbcore/ssl/sslEndpoint.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/ssl/sslEndpoint.h b/src/lib/omniORB/orbcore/ssl/sslEndpoint.h
-index db3c555..89b0422 100644
---- a/src/lib/omniORB/orbcore/ssl/sslEndpoint.h
-+++ b/src/lib/omniORB/orbcore/ssl/sslEndpoint.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/ssl/sslTransportImpl.cc b/src/lib/omniORB/orbcore/ssl/sslTransportImpl.cc
-index 0b07fdb..caa6162 100644
---- a/src/lib/omniORB/orbcore/ssl/sslTransportImpl.cc
-+++ b/src/lib/omniORB/orbcore/ssl/sslTransportImpl.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/ssl/sslTransportImpl.h b/src/lib/omniORB/orbcore/ssl/sslTransportImpl.h
-index 431f1b1..a2c1773 100644
---- a/src/lib/omniORB/orbcore/ssl/sslTransportImpl.h
-+++ b/src/lib/omniORB/orbcore/ssl/sslTransportImpl.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/tcp/tcpActive.cc b/src/lib/omniORB/orbcore/tcp/tcpActive.cc
-index 9955914..abfcf6a 100644
---- a/src/lib/omniORB/orbcore/tcp/tcpActive.cc
-+++ b/src/lib/omniORB/orbcore/tcp/tcpActive.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/tcp/tcpAddress.cc b/src/lib/omniORB/orbcore/tcp/tcpAddress.cc
-index ee577c7..ef66434 100644
---- a/src/lib/omniORB/orbcore/tcp/tcpAddress.cc
-+++ b/src/lib/omniORB/orbcore/tcp/tcpAddress.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/tcp/tcpAddress.h b/src/lib/omniORB/orbcore/tcp/tcpAddress.h
-index 7095e84..c3bc2c3 100644
---- a/src/lib/omniORB/orbcore/tcp/tcpAddress.h
-+++ b/src/lib/omniORB/orbcore/tcp/tcpAddress.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/tcp/tcpConnection.cc b/src/lib/omniORB/orbcore/tcp/tcpConnection.cc
-index bf17500..00ed12e 100644
---- a/src/lib/omniORB/orbcore/tcp/tcpConnection.cc
-+++ b/src/lib/omniORB/orbcore/tcp/tcpConnection.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/tcp/tcpConnection.h b/src/lib/omniORB/orbcore/tcp/tcpConnection.h
-index dcfbf07..1eec1c1 100644
---- a/src/lib/omniORB/orbcore/tcp/tcpConnection.h
-+++ b/src/lib/omniORB/orbcore/tcp/tcpConnection.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/tcp/tcpEndpoint.cc b/src/lib/omniORB/orbcore/tcp/tcpEndpoint.cc
-index e1700a6..0952286 100644
---- a/src/lib/omniORB/orbcore/tcp/tcpEndpoint.cc
-+++ b/src/lib/omniORB/orbcore/tcp/tcpEndpoint.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/tcp/tcpEndpoint.h b/src/lib/omniORB/orbcore/tcp/tcpEndpoint.h
-index a27d80d..9d0ac79 100644
---- a/src/lib/omniORB/orbcore/tcp/tcpEndpoint.h
-+++ b/src/lib/omniORB/orbcore/tcp/tcpEndpoint.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.cc b/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.cc
-index 94c4d57..b0965e8 100644
---- a/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.cc
-+++ b/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.h b/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.h
-index 9e15cb1..9523ea6 100644
---- a/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.h
-+++ b/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/tracedthread.cc b/src/lib/omniORB/orbcore/tracedthread.cc
-index 62027af..9cd4c51 100644
---- a/src/lib/omniORB/orbcore/tracedthread.cc
-+++ b/src/lib/omniORB/orbcore/tracedthread.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/transportRules.cc b/src/lib/omniORB/orbcore/transportRules.cc
-index f2a3b79..77eea2d 100644
---- a/src/lib/omniORB/orbcore/transportRules.cc
-+++ b/src/lib/omniORB/orbcore/transportRules.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/unix/unixActive.cc b/src/lib/omniORB/orbcore/unix/unixActive.cc
-index 08530f5..1b81dd7 100644
---- a/src/lib/omniORB/orbcore/unix/unixActive.cc
-+++ b/src/lib/omniORB/orbcore/unix/unixActive.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/unix/unixAddress.cc b/src/lib/omniORB/orbcore/unix/unixAddress.cc
-index bc2dc29..efc575a 100644
---- a/src/lib/omniORB/orbcore/unix/unixAddress.cc
-+++ b/src/lib/omniORB/orbcore/unix/unixAddress.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/unix/unixAddress.h b/src/lib/omniORB/orbcore/unix/unixAddress.h
-index 8075368..76ae1bf 100644
---- a/src/lib/omniORB/orbcore/unix/unixAddress.h
-+++ b/src/lib/omniORB/orbcore/unix/unixAddress.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/unix/unixConnection.cc b/src/lib/omniORB/orbcore/unix/unixConnection.cc
-index 92d21bf..1e688b7 100644
---- a/src/lib/omniORB/orbcore/unix/unixConnection.cc
-+++ b/src/lib/omniORB/orbcore/unix/unixConnection.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/unix/unixConnection.h b/src/lib/omniORB/orbcore/unix/unixConnection.h
-index 8a6ff68..ef965de 100644
---- a/src/lib/omniORB/orbcore/unix/unixConnection.h
-+++ b/src/lib/omniORB/orbcore/unix/unixConnection.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/unix/unixEndpoint.cc b/src/lib/omniORB/orbcore/unix/unixEndpoint.cc
-index a180269..6ae3894 100644
---- a/src/lib/omniORB/orbcore/unix/unixEndpoint.cc
-+++ b/src/lib/omniORB/orbcore/unix/unixEndpoint.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/unix/unixEndpoint.h b/src/lib/omniORB/orbcore/unix/unixEndpoint.h
-index 7fffc2d..ecd386d 100644
---- a/src/lib/omniORB/orbcore/unix/unixEndpoint.h
-+++ b/src/lib/omniORB/orbcore/unix/unixEndpoint.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/unix/unixTransportImpl.cc b/src/lib/omniORB/orbcore/unix/unixTransportImpl.cc
-index 7f082bf..422529e 100644
---- a/src/lib/omniORB/orbcore/unix/unixTransportImpl.cc
-+++ b/src/lib/omniORB/orbcore/unix/unixTransportImpl.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/unix/unixTransportImpl.h b/src/lib/omniORB/orbcore/unix/unixTransportImpl.h
-index 1bbaa74..d912f31 100644
---- a/src/lib/omniORB/orbcore/unix/unixTransportImpl.h
-+++ b/src/lib/omniORB/orbcore/unix/unixTransportImpl.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omniORB/orbcore/uri.cc b/src/lib/omniORB/orbcore/uri.cc
-index 38bc5d3..f68ccf3 100644
---- a/src/lib/omniORB/orbcore/uri.cc
-+++ b/src/lib/omniORB/orbcore/uri.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Description:
-diff --git a/src/lib/omnithread/mach.cc b/src/lib/omnithread/mach.cc
-index a288e3f..c078615 100644
---- a/src/lib/omnithread/mach.cc
-+++ b/src/lib/omnithread/mach.cc
-@@ -17,8 +17,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
-
- //
-diff --git a/src/lib/omnithread/nt.cc b/src/lib/omnithread/nt.cc
-index 2858496..1174343 100644
---- a/src/lib/omnithread/nt.cc
-+++ b/src/lib/omnithread/nt.cc
-@@ -18,8 +18,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
-
- //
-diff --git a/src/lib/omnithread/posix.cc b/src/lib/omnithread/posix.cc
-index 025d9f5..9f43086 100644
---- a/src/lib/omnithread/posix.cc
-+++ b/src/lib/omnithread/posix.cc
-@@ -18,8 +18,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
-
- //
-diff --git a/src/lib/omnithread/solaris.cc b/src/lib/omnithread/solaris.cc
-index 9091326..ced87f4 100644
---- a/src/lib/omnithread/solaris.cc
-+++ b/src/lib/omnithread/solaris.cc
-@@ -17,8 +17,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // Implementation of OMNI thread abstraction for solaris threads.
-diff --git a/src/lib/omnithread/threaddata.cc b/src/lib/omnithread/threaddata.cc
-index 3d00771..f019e4e 100644
---- a/src/lib/omnithread/threaddata.cc
-+++ b/src/lib/omnithread/threaddata.cc
-@@ -17,8 +17,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
-
- // Implementation of per-thread data
-diff --git a/src/services/mklib/COS_sysdep.h b/src/services/mklib/COS_sysdep.h
-index 82f7272..e39f240 100644
---- a/src/services/mklib/COS_sysdep.h
-+++ b/src/services/mklib/COS_sysdep.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // This file is included by COS stub headers.
-diff --git a/src/services/mklib/mkBOAlib/COS_sysdep.h b/src/services/mklib/mkBOAlib/COS_sysdep.h
-index 45f09ca..f627dbe 100644
---- a/src/services/mklib/mkBOAlib/COS_sysdep.h
-+++ b/src/services/mklib/mkBOAlib/COS_sysdep.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU Library General Public
- // License along with this library; if not, write to the Free
--// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA
-+// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA
- //
- //
- // This file is included by COS stub headers.
-diff --git a/src/tool/omniidl/COPYING b/src/tool/omniidl/COPYING
-index ae3b531..e3f290f 100644
---- a/src/tool/omniidl/COPYING
-+++ b/src/tool/omniidl/COPYING
-@@ -2,7 +2,7 @@
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- USA.
-
- Also add information on how to contact you by electronic and paper mail.
-diff --git a/src/tool/omniidl/cxx/cccp/cccp.c b/src/tool/omniidl/cxx/cccp/cccp.c
-index 0198b1a..0f9484b 100644
---- a/src/tool/omniidl/cxx/cccp/cccp.c
-+++ b/src/tool/omniidl/cxx/cccp/cccp.c
-@@ -15,8 +15,8 @@ GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
--Foundation, 59 Temple Place - Suite 330,
--Boston, MA 02111-1307, USA.
-+Foundation, 51 Franklin St, Fifth Floor,
-+Boston, MA 02110-1301, USA.
-
- In other words, you are welcome to use, share and improve this program.
- You are forbidden to forbid anyone else to use, share and improve
-diff --git a/src/tool/omniidl/cxx/cccp/cexp.y b/src/tool/omniidl/cxx/cccp/cexp.y
-index 133539f..3ee3e72 100644
---- a/src/tool/omniidl/cxx/cccp/cexp.y
-+++ b/src/tool/omniidl/cxx/cccp/cexp.y
-@@ -13,8 +13,8 @@ GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
--Foundation, 59 Temple Place - Suite 330,
--Boston, MA 02111-1307, USA.
-+Foundation, 51 Franklin St, Fifth Floor,
-+Boston, MA 02110-1301, USA.
-
- In other words, you are welcome to use, share and improve this program.
- You are forbidden to forbid anyone else to use, share and improve
-diff --git a/src/tool/omniidl/cxx/cccp/pcp.h b/src/tool/omniidl/cxx/cccp/pcp.h
-index 280a65e..d79c31c 100644
---- a/src/tool/omniidl/cxx/cccp/pcp.h
-+++ b/src/tool/omniidl/cxx/cccp/pcp.h
-@@ -15,8 +15,8 @@ GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNU CC; see the file COPYING. If not, write to
--the Free Software Foundation, 59 Temple Place - Suite 330,
--Boston, MA 02111-1307, USA. */
-+the Free Software Foundation, 51 Franklin St, Fifth Floor,
-+Boston, MA 02110-1301, USA. */
-
-
-
-diff --git a/src/tool/omniidl/cxx/idl.ll b/src/tool/omniidl/cxx/idl.ll
-index 5ed38ba..12a9ac5 100644
---- a/src/tool/omniidl/cxx/idl.ll
-+++ b/src/tool/omniidl/cxx/idl.ll
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idl.yy b/src/tool/omniidl/cxx/idl.yy
-index d1a5058..2358c40 100644
---- a/src/tool/omniidl/cxx/idl.yy
-+++ b/src/tool/omniidl/cxx/idl.yy
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlast.cc b/src/tool/omniidl/cxx/idlast.cc
-index f636927..83d0872 100644
---- a/src/tool/omniidl/cxx/idlast.cc
-+++ b/src/tool/omniidl/cxx/idlast.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlast.h b/src/tool/omniidl/cxx/idlast.h
-index 943579c..9b256c0 100644
---- a/src/tool/omniidl/cxx/idlast.h
-+++ b/src/tool/omniidl/cxx/idlast.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlc.cc b/src/tool/omniidl/cxx/idlc.cc
-index 09a58b7..a8c6064 100644
---- a/src/tool/omniidl/cxx/idlc.cc
-+++ b/src/tool/omniidl/cxx/idlc.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlconfig.cc b/src/tool/omniidl/cxx/idlconfig.cc
-index 2b8e884..c0e37a7 100644
---- a/src/tool/omniidl/cxx/idlconfig.cc
-+++ b/src/tool/omniidl/cxx/idlconfig.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlconfig.h b/src/tool/omniidl/cxx/idlconfig.h
-index 741ac56..2df9f4e 100644
---- a/src/tool/omniidl/cxx/idlconfig.h
-+++ b/src/tool/omniidl/cxx/idlconfig.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idldump.cc b/src/tool/omniidl/cxx/idldump.cc
-index 90c9a64..e6c1e9b 100644
---- a/src/tool/omniidl/cxx/idldump.cc
-+++ b/src/tool/omniidl/cxx/idldump.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idldump.h b/src/tool/omniidl/cxx/idldump.h
-index ce97c73..833ab13 100644
---- a/src/tool/omniidl/cxx/idldump.h
-+++ b/src/tool/omniidl/cxx/idldump.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlerr.cc b/src/tool/omniidl/cxx/idlerr.cc
-index 24de726..9922c24 100644
---- a/src/tool/omniidl/cxx/idlerr.cc
-+++ b/src/tool/omniidl/cxx/idlerr.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlerr.h b/src/tool/omniidl/cxx/idlerr.h
-index afaa250..89620d2 100644
---- a/src/tool/omniidl/cxx/idlerr.h
-+++ b/src/tool/omniidl/cxx/idlerr.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlexpr.cc b/src/tool/omniidl/cxx/idlexpr.cc
-index 3143f57..211d18f 100644
---- a/src/tool/omniidl/cxx/idlexpr.cc
-+++ b/src/tool/omniidl/cxx/idlexpr.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlexpr.h b/src/tool/omniidl/cxx/idlexpr.h
-index 49910aa..d000ab9 100644
---- a/src/tool/omniidl/cxx/idlexpr.h
-+++ b/src/tool/omniidl/cxx/idlexpr.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlfixed.cc b/src/tool/omniidl/cxx/idlfixed.cc
-index 8ecc1db..1318d4e 100644
---- a/src/tool/omniidl/cxx/idlfixed.cc
-+++ b/src/tool/omniidl/cxx/idlfixed.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlfixed.h b/src/tool/omniidl/cxx/idlfixed.h
-index 42a1dd0..c004005 100644
---- a/src/tool/omniidl/cxx/idlfixed.h
-+++ b/src/tool/omniidl/cxx/idlfixed.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlmath.h b/src/tool/omniidl/cxx/idlmath.h
-index 25230e4..00bec26 100644
---- a/src/tool/omniidl/cxx/idlmath.h
-+++ b/src/tool/omniidl/cxx/idlmath.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlpython.cc b/src/tool/omniidl/cxx/idlpython.cc
-index f823a5e..d898ae9 100644
---- a/src/tool/omniidl/cxx/idlpython.cc
-+++ b/src/tool/omniidl/cxx/idlpython.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlrepoId.cc b/src/tool/omniidl/cxx/idlrepoId.cc
-index 3b83a99..7119510 100644
---- a/src/tool/omniidl/cxx/idlrepoId.cc
-+++ b/src/tool/omniidl/cxx/idlrepoId.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlrepoId.h b/src/tool/omniidl/cxx/idlrepoId.h
-index 31b8c1f..65a9880 100644
---- a/src/tool/omniidl/cxx/idlrepoId.h
-+++ b/src/tool/omniidl/cxx/idlrepoId.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlscope.cc b/src/tool/omniidl/cxx/idlscope.cc
-index 0867da4..e8ece46 100644
---- a/src/tool/omniidl/cxx/idlscope.cc
-+++ b/src/tool/omniidl/cxx/idlscope.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlscope.h b/src/tool/omniidl/cxx/idlscope.h
-index 8806942..132fe4d 100644
---- a/src/tool/omniidl/cxx/idlscope.h
-+++ b/src/tool/omniidl/cxx/idlscope.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlsysdep.h b/src/tool/omniidl/cxx/idlsysdep.h
-index a18ed5e..0495352 100644
---- a/src/tool/omniidl/cxx/idlsysdep.h
-+++ b/src/tool/omniidl/cxx/idlsysdep.h
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idltype.cc b/src/tool/omniidl/cxx/idltype.cc
-index b952fae..dd80e05 100644
---- a/src/tool/omniidl/cxx/idltype.cc
-+++ b/src/tool/omniidl/cxx/idltype.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idltype.h b/src/tool/omniidl/cxx/idltype.h
-index 99e44bd..545688d 100644
---- a/src/tool/omniidl/cxx/idltype.h
-+++ b/src/tool/omniidl/cxx/idltype.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlutil.cc b/src/tool/omniidl/cxx/idlutil.cc
-index 7fa0cde..7066167 100644
---- a/src/tool/omniidl/cxx/idlutil.cc
-+++ b/src/tool/omniidl/cxx/idlutil.cc
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlutil.h b/src/tool/omniidl/cxx/idlutil.h
-index 771365b..fbda2b4 100644
---- a/src/tool/omniidl/cxx/idlutil.h
-+++ b/src/tool/omniidl/cxx/idlutil.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlvalidate.cc b/src/tool/omniidl/cxx/idlvalidate.cc
-index 817adef..baa2333 100644
---- a/src/tool/omniidl/cxx/idlvalidate.cc
-+++ b/src/tool/omniidl/cxx/idlvalidate.cc
-@@ -20,8 +20,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlvalidate.h b/src/tool/omniidl/cxx/idlvalidate.h
-index 7ecb56b..ed70b95 100644
---- a/src/tool/omniidl/cxx/idlvalidate.h
-+++ b/src/tool/omniidl/cxx/idlvalidate.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/idlvisitor.h b/src/tool/omniidl/cxx/idlvisitor.h
-index f478c6f..9e14013 100644
---- a/src/tool/omniidl/cxx/idlvisitor.h
-+++ b/src/tool/omniidl/cxx/idlvisitor.h
-@@ -19,8 +19,8 @@
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/lex.yy.cc b/src/tool/omniidl/cxx/lex.yy.cc
-index 3ef98b9..412bcac 100644
---- a/src/tool/omniidl/cxx/lex.yy.cc
-+++ b/src/tool/omniidl/cxx/lex.yy.cc
-@@ -837,8 +837,8 @@ char *yytext;
- //
- // You should have received a copy of the GNU General Public License
- // along with this program; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--// 02111-1307, USA.
-+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+// 02110-1301, USA.
- //
- // Description:
- //
-diff --git a/src/tool/omniidl/cxx/y.tab.cc b/src/tool/omniidl/cxx/y.tab.cc
-index 9ed0088..cbb4899 100644
---- a/src/tool/omniidl/cxx/y.tab.cc
-+++ b/src/tool/omniidl/cxx/y.tab.cc
-@@ -991,8 +991,8 @@ static const short yycheck[] =
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330,
-- Boston, MA 02111-1307, USA. */
-+ Foundation, Inc., 51 Franklin St, Fifth Floor,
-+ Boston, MA 02110-1301, USA. */
-
- /* As a special exception, when this file is copied by Bison into a
- Bison output file, you may use that output file without restriction.
-diff --git a/src/tool/omniidl/python/omniidl/idlast.py b/src/tool/omniidl/python/omniidl/idlast.py
-index c03b61c..8083b41 100644
---- a/src/tool/omniidl/python/omniidl/idlast.py
-+++ b/src/tool/omniidl/python/omniidl/idlast.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/tool/omniidl/python/omniidl/idlstring.py b/src/tool/omniidl/python/omniidl/idlstring.py
-index 5e2c7f4..05158cd 100644
---- a/src/tool/omniidl/python/omniidl/idlstring.py
-+++ b/src/tool/omniidl/python/omniidl/idlstring.py
-@@ -19,8 +19,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/tool/omniidl/python/omniidl/idltype.py b/src/tool/omniidl/python/omniidl/idltype.py
-index 609ca66..a6c508f 100644
---- a/src/tool/omniidl/python/omniidl/idltype.py
-+++ b/src/tool/omniidl/python/omniidl/idltype.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/tool/omniidl/python/omniidl/idlutil.py b/src/tool/omniidl/python/omniidl/idlutil.py
-index 68ce897..37214f0 100644
---- a/src/tool/omniidl/python/omniidl/idlutil.py
-+++ b/src/tool/omniidl/python/omniidl/idlutil.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/tool/omniidl/python/omniidl/idlvisitor.py b/src/tool/omniidl/python/omniidl/idlvisitor.py
-index a86eda9..0b6566c 100644
---- a/src/tool/omniidl/python/omniidl/idlvisitor.py
-+++ b/src/tool/omniidl/python/omniidl/idlvisitor.py
-@@ -19,8 +19,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/tool/omniidl/python/omniidl/main.py b/src/tool/omniidl/python/omniidl/main.py
-index 73cf6b8..0c13331 100644
---- a/src/tool/omniidl/python/omniidl/main.py
-+++ b/src/tool/omniidl/python/omniidl/main.py
-@@ -21,8 +21,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/tool/omniidl/python/omniidl/output.py b/src/tool/omniidl/python/omniidl/output.py
-index 5c1700a..9344836 100644
---- a/src/tool/omniidl/python/omniidl/output.py
-+++ b/src/tool/omniidl/python/omniidl/output.py
-@@ -19,8 +19,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/tool/omniidl/python/omniidl_be/dump.py b/src/tool/omniidl/python/omniidl_be/dump.py
-index 251fc0f..9bb5f2b 100644
---- a/src/tool/omniidl/python/omniidl_be/dump.py
-+++ b/src/tool/omniidl/python/omniidl_be/dump.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/tool/omniidl/python/omniidl_be/example.py b/src/tool/omniidl/python/omniidl_be/example.py
-index 7a28d28..45ea2d7 100644
---- a/src/tool/omniidl/python/omniidl_be/example.py
-+++ b/src/tool/omniidl/python/omniidl_be/example.py
-@@ -19,8 +19,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/tool/omniidl/python/omniidl_be/interactive.py b/src/tool/omniidl/python/omniidl_be/interactive.py
-index b18d394..3a03a8d 100644
---- a/src/tool/omniidl/python/omniidl_be/interactive.py
-+++ b/src/tool/omniidl/python/omniidl_be/interactive.py
-@@ -19,8 +19,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/tool/omniidl/python/scripts/omniidl.in b/src/tool/omniidl/python/scripts/omniidl.in
-index d5ad0b9..a6162da 100644
---- a/src/tool/omniidl/python/scripts/omniidl.in
-+++ b/src/tool/omniidl/python/scripts/omniidl.in
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
-diff --git a/src/tool/omniidl/python/scripts/omniidlrun.py b/src/tool/omniidl/python/scripts/omniidlrun.py
-index 4b5d9f0..b1146b4 100644
---- a/src/tool/omniidl/python/scripts/omniidlrun.py
-+++ b/src/tool/omniidl/python/scripts/omniidlrun.py
-@@ -20,8 +20,8 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # Description:
- #
diff --git a/omniORB-4.2.0-format-security.patch b/omniORB-4.2.0-format-security.patch
new file mode 100644
index 0000000..c7b61df
--- /dev/null
+++ b/omniORB-4.2.0-format-security.patch
@@ -0,0 +1,12 @@
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/cccp/cccp.c omniORB-4.2.0-new/src/tool/omniidl/cxx/cccp/cccp.c
+--- omniORB-4.2.0/src/tool/omniidl/cxx/cccp/cccp.c 2006-08-02 16:26:34.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/cccp/cccp.c 2014-05-08 23:59:25.128579735 +0200
+@@ -8034,7 +8034,7 @@ macroexpand (hp, op)
+ else
+ parse_error = macarg (NULL_PTR, 0);
+ if (parse_error) {
+- error_with_line (line_for_error (start_line), parse_error);
++ error_with_line (line_for_error (start_line), "%s", parse_error);
+ break;
+ }
+ i++;
diff --git a/omniORB-4.2.0-fsf-address.patch b/omniORB-4.2.0-fsf-address.patch
new file mode 100644
index 0000000..e09c7cb
--- /dev/null
+++ b/omniORB-4.2.0-fsf-address.patch
@@ -0,0 +1,6623 @@
+diff -rupN omniORB-4.2.0/aclocal.m4 omniORB-4.2.0-new/aclocal.m4
+--- omniORB-4.2.0/aclocal.m4 2013-12-30 16:08:29.000000000 +0100
++++ omniORB-4.2.0-new/aclocal.m4 2014-05-08 22:38:03.738113681 +0200
+@@ -29,7 +29,7 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_de
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+diff -rupN omniORB-4.2.0/bin/scripts/config.guess omniORB-4.2.0-new/bin/scripts/config.guess
+--- omniORB-4.2.0/bin/scripts/config.guess 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/bin/scripts/config.guess 2014-05-08 22:38:03.791114861 +0200
+@@ -17,7 +17,7 @@ timestamp='2001-08-21'
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+diff -rupN omniORB-4.2.0/bin/scripts/config.sub omniORB-4.2.0-new/bin/scripts/config.sub
+--- omniORB-4.2.0/bin/scripts/config.sub 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/bin/scripts/config.sub 2014-05-08 22:38:03.794114929 +0200
+@@ -21,8 +21,8 @@ timestamp='2001-08-13'
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+diff -rupN omniORB-4.2.0/COPYING omniORB-4.2.0-new/COPYING
+--- omniORB-4.2.0/COPYING 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/COPYING 2014-05-08 22:38:03.777114550 +0200
+@@ -2,7 +2,7 @@
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
++ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+@@ -305,7 +305,7 @@ the "copyright" line and a pointer to wh
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ USA.
+
+ Also add information on how to contact you by electronic and paper mail.
+diff -rupN omniORB-4.2.0/COPYING.LIB omniORB-4.2.0-new/COPYING.LIB
+--- omniORB-4.2.0/COPYING.LIB 2007-11-21 00:32:10.000000000 +0100
++++ omniORB-4.2.0-new/COPYING.LIB 2014-05-08 22:38:03.510108603 +0200
+@@ -2,7 +2,7 @@
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+@@ -485,7 +485,7 @@ convey the exclusion of warranty; and ea
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ Also add information on how to contact you by electronic and paper mail.
+
+diff -rupN omniORB-4.2.0/idl/omniConnectionData.idl omniORB-4.2.0-new/idl/omniConnectionData.idl
+--- omniORB-4.2.0/idl/omniConnectionData.idl 2006-07-18 18:21:26.000000000 +0200
++++ omniORB-4.2.0-new/idl/omniConnectionData.idl 2014-05-08 22:38:03.766114305 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/idl/omniTypedefs.idl omniORB-4.2.0-new/idl/omniTypedefs.idl
+--- omniORB-4.2.0/idl/omniTypedefs.idl 2006-07-18 18:21:26.000000000 +0200
++++ omniORB-4.2.0-new/idl/omniTypedefs.idl 2014-05-08 22:38:03.765114283 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniconfig.h omniORB-4.2.0-new/include/omniconfig.h
+--- omniORB-4.2.0/include/omniconfig.h 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/include/omniconfig.h 2014-05-08 22:38:03.710113057 +0200
+@@ -19,8 +19,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA
+ *
+ *
+ * Description:
+diff -rupN omniORB-4.2.0/include/omniconfig.h.in omniORB-4.2.0-new/include/omniconfig.h.in
+--- omniORB-4.2.0/include/omniconfig.h.in 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/include/omniconfig.h.in 2014-05-08 22:38:03.710113057 +0200
+@@ -19,8 +19,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA
+ *
+ *
+ * Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/ami.h omniORB-4.2.0-new/include/omniORB4/ami.h
+--- omniORB-4.2.0/include/omniORB4/ami.h 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/ami.h 2014-05-08 22:38:03.675112278 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/include/omniORB4/anyStream.h omniORB-4.2.0-new/include/omniORB4/anyStream.h
+--- omniORB-4.2.0/include/omniORB4/anyStream.h 2013-04-30 19:22:28.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/anyStream.h 2014-05-08 22:38:03.668112122 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/BiDirPolicy.h omniORB-4.2.0-new/include/omniORB4/BiDirPolicy.h
+--- omniORB-4.2.0/include/omniORB4/BiDirPolicy.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/BiDirPolicy.h 2014-05-08 22:38:03.695112723 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/boa.h omniORB-4.2.0-new/include/omniORB4/boa.h
+--- omniORB-4.2.0/include/omniORB4/boa.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/boa.h 2014-05-08 22:38:03.700112835 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/callDescriptor.h omniORB-4.2.0-new/include/omniORB4/callDescriptor.h
+--- omniORB-4.2.0/include/omniORB4/callDescriptor.h 2013-09-03 23:30:14.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/callDescriptor.h 2014-05-08 22:38:03.706112969 +0200
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Object that encapsulates a call to be performed
+diff -rupN omniORB-4.2.0/include/omniORB4/callHandle.h omniORB-4.2.0-new/include/omniORB4/callHandle.h
+--- omniORB-4.2.0/include/omniORB4/callHandle.h 2013-04-12 15:38:30.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/callHandle.h 2014-05-08 22:38:03.667112100 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/cdrStream.h omniORB-4.2.0-new/include/omniORB4/cdrStream.h
+--- omniORB-4.2.0/include/omniORB4/cdrStream.h 2013-09-03 16:25:52.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/cdrStream.h 2014-05-08 22:38:03.619111031 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/codeSets.h omniORB-4.2.0-new/include/omniORB4/codeSets.h
+--- omniORB-4.2.0/include/omniORB4/codeSets.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/codeSets.h 2014-05-08 22:38:03.700112835 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_AbstractBase.h omniORB-4.2.0-new/include/omniORB4/CORBA_AbstractBase.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_AbstractBase.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_AbstractBase.h 2014-05-08 22:38:03.615110942 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Any.h omniORB-4.2.0-new/include/omniORB4/CORBA_Any.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Any.h 2013-08-29 13:55:10.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Any.h 2014-05-08 22:38:03.669112145 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Any_vartypes.h omniORB-4.2.0-new/include/omniORB4/CORBA_Any_vartypes.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Any_vartypes.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Any_vartypes.h 2014-05-08 22:38:03.674112256 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_basetypes.h omniORB-4.2.0-new/include/omniORB4/CORBA_basetypes.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_basetypes.h 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_basetypes.h 2014-05-08 22:38:03.616110964 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_BOA.h omniORB-4.2.0-new/include/omniORB4/CORBA_BOA.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_BOA.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_BOA.h 2014-05-08 22:38:03.678112345 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Context.h omniORB-4.2.0-new/include/omniORB4/CORBA_Context.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Context.h 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Context.h 2014-05-08 22:38:03.615110942 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Current.h omniORB-4.2.0-new/include/omniORB4/CORBA_Current.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Current.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Current.h 2014-05-08 22:38:03.667112100 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_DomainManager.h omniORB-4.2.0-new/include/omniORB4/CORBA_DomainManager.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_DomainManager.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_DomainManager.h 2014-05-08 22:38:03.611110853 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Environment.h omniORB-4.2.0-new/include/omniORB4/CORBA_Environment.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Environment.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Environment.h 2014-05-08 22:38:03.693112679 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Exception.h omniORB-4.2.0-new/include/omniORB4/CORBA_Exception.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Exception.h 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Exception.h 2014-05-08 22:38:03.659111921 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_ExceptionList.h omniORB-4.2.0-new/include/omniORB4/CORBA_ExceptionList.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_ExceptionList.h 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_ExceptionList.h 2014-05-08 22:38:03.693112679 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Fixed.h omniORB-4.2.0-new/include/omniORB4/CORBA_Fixed.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Fixed.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Fixed.h 2014-05-08 22:38:03.690112612 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA.h omniORB-4.2.0-new/include/omniORB4/CORBA.h
+--- omniORB-4.2.0/include/omniORB4/CORBA.h 2014-03-11 17:06:40.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/CORBA.h 2014-05-08 22:38:03.613110897 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_LocalObject.h omniORB-4.2.0-new/include/omniORB4/CORBA_LocalObject.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_LocalObject.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_LocalObject.h 2014-05-08 22:38:03.677112323 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_LocalObject_vartypes.h omniORB-4.2.0-new/include/omniORB4/CORBA_LocalObject_vartypes.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_LocalObject_vartypes.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_LocalObject_vartypes.h 2014-05-08 22:38:03.672112211 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ #ifndef INSIDE_OMNIORB_CORBA_MODULE
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_NamedValue.h omniORB-4.2.0-new/include/omniORB4/CORBA_NamedValue.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_NamedValue.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_NamedValue.h 2014-05-08 22:38:03.660111944 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Object.h omniORB-4.2.0-new/include/omniORB4/CORBA_Object.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Object.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Object.h 2014-05-08 22:38:03.626111187 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Object_vartypes.h omniORB-4.2.0-new/include/omniORB4/CORBA_Object_vartypes.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Object_vartypes.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Object_vartypes.h 2014-05-08 22:38:03.676112301 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/corba_operators.h omniORB-4.2.0-new/include/omniORB4/corba_operators.h
+--- omniORB-4.2.0/include/omniORB4/corba_operators.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/corba_operators.h 2014-05-08 22:38:03.609110808 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_ORB.h omniORB-4.2.0-new/include/omniORB4/CORBA_ORB.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_ORB.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_ORB.h 2014-05-08 22:38:03.673112233 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Policy.h omniORB-4.2.0-new/include/omniORB4/CORBA_Policy.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Policy.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Policy.h 2014-05-08 22:38:03.675112278 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_primitive_types.h omniORB-4.2.0-new/include/omniORB4/CORBA_primitive_types.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_primitive_types.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_primitive_types.h 2014-05-08 22:38:03.626111187 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Principal.h omniORB-4.2.0-new/include/omniORB4/CORBA_Principal.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Principal.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Principal.h 2014-05-08 22:38:03.691112635 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_Request.h omniORB-4.2.0-new/include/omniORB4/CORBA_Request.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_Request.h 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_Request.h 2014-05-08 22:38:03.673112233 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_ServerRequest.h omniORB-4.2.0-new/include/omniORB4/CORBA_ServerRequest.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_ServerRequest.h 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_ServerRequest.h 2014-05-08 22:38:03.673112233 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_static_fns.h omniORB-4.2.0-new/include/omniORB4/CORBA_static_fns.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_static_fns.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_static_fns.h 2014-05-08 22:38:03.678112345 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_String.h omniORB-4.2.0-new/include/omniORB4/CORBA_String.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_String.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_String.h 2014-05-08 22:38:03.691112635 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_sysdep_auto.h omniORB-4.2.0-new/include/omniORB4/CORBA_sysdep_auto.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_sysdep_auto.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_sysdep_auto.h 2014-05-08 22:38:03.610110831 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_sysdep.h omniORB-4.2.0-new/include/omniORB4/CORBA_sysdep.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_sysdep.h 2014-01-17 16:27:56.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_sysdep.h 2014-05-08 22:38:03.682112434 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_sysdep_trad.h omniORB-4.2.0-new/include/omniORB4/CORBA_sysdep_trad.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_sysdep_trad.h 2014-01-17 16:27:56.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_sysdep_trad.h 2014-05-08 22:38:03.677112323 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_TypeCode.h omniORB-4.2.0-new/include/omniORB4/CORBA_TypeCode.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_TypeCode.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_TypeCode.h 2014-05-08 22:38:03.703112901 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_TypeCode_member.h omniORB-4.2.0-new/include/omniORB4/CORBA_TypeCode_member.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_TypeCode_member.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_TypeCode_member.h 2014-05-08 22:38:03.697112768 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_UnknownUserException.h omniORB-4.2.0-new/include/omniORB4/CORBA_UnknownUserException.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_UnknownUserException.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_UnknownUserException.h 2014-05-08 22:38:03.694112701 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_ValueBase.h omniORB-4.2.0-new/include/omniORB4/CORBA_ValueBase.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_ValueBase.h 2012-02-24 11:43:54.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_ValueBase.h 2014-05-08 22:38:03.610110831 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_ValueBase_vartypes.h omniORB-4.2.0-new/include/omniORB4/CORBA_ValueBase_vartypes.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_ValueBase_vartypes.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_ValueBase_vartypes.h 2014-05-08 22:38:03.688112567 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/CORBA_vartypes.h omniORB-4.2.0-new/include/omniORB4/CORBA_vartypes.h
+--- omniORB-4.2.0/include/omniORB4/CORBA_vartypes.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/CORBA_vartypes.h 2014-05-08 22:38:03.687112545 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/dynAny.h omniORB-4.2.0-new/include/omniORB4/dynAny.h
+--- omniORB-4.2.0/include/omniORB4/dynAny.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/dynAny.h 2014-05-08 22:38:03.665112055 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/finalCleanup.h omniORB-4.2.0-new/include/omniORB4/finalCleanup.h
+--- omniORB-4.2.0/include/omniORB4/finalCleanup.h 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/finalCleanup.h 2014-05-08 22:38:03.609110808 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/fixed.h omniORB-4.2.0-new/include/omniORB4/fixed.h
+--- omniORB-4.2.0/include/omniORB4/fixed.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/fixed.h 2014-05-08 22:38:03.610110831 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/giopEndpoint.h omniORB-4.2.0-new/include/omniORB4/giopEndpoint.h
+--- omniORB-4.2.0/include/omniORB4/giopEndpoint.h 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/giopEndpoint.h 2014-05-08 22:38:03.680112389 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/GIOP.h omniORB-4.2.0-new/include/omniORB4/GIOP.h
+--- omniORB-4.2.0/include/omniORB4/GIOP.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/GIOP.h 2014-05-08 22:38:03.668112122 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/IIOP.h omniORB-4.2.0-new/include/omniORB4/IIOP.h
+--- omniORB-4.2.0/include/omniORB4/IIOP.h 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/IIOP.h 2014-05-08 22:38:03.657111877 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/anonObject.h omniORB-4.2.0-new/include/omniORB4/internal/anonObject.h
+--- omniORB-4.2.0/include/omniORB4/internal/anonObject.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/anonObject.h 2014-05-08 22:38:03.637111431 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/codeSetUtil.h omniORB-4.2.0-new/include/omniORB4/internal/codeSetUtil.h
+--- omniORB-4.2.0/include/omniORB4/internal/codeSetUtil.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/codeSetUtil.h 2014-05-08 22:38:03.631111298 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/context.h omniORB-4.2.0-new/include/omniORB4/internal/context.h
+--- omniORB-4.2.0/include/omniORB4/internal/context.h 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/context.h 2014-05-08 22:38:03.627111209 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/corbaBoa.h omniORB-4.2.0-new/include/omniORB4/internal/corbaBoa.h
+--- omniORB-4.2.0/include/omniORB4/internal/corbaBoa.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/corbaBoa.h 2014-05-08 22:38:03.643111565 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/corbaOrb.h omniORB-4.2.0-new/include/omniORB4/internal/corbaOrb.h
+--- omniORB-4.2.0/include/omniORB4/internal/corbaOrb.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/corbaOrb.h 2014-05-08 22:38:03.641111521 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/dynamicImplementation.h omniORB-4.2.0-new/include/omniORB4/internal/dynamicImplementation.h
+--- omniORB-4.2.0/include/omniORB4/internal/dynamicImplementation.h 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/internal/dynamicImplementation.h 2014-05-08 22:38:03.647111655 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/dynamicLib.h omniORB-4.2.0-new/include/omniORB4/internal/dynamicLib.h
+--- omniORB-4.2.0/include/omniORB4/internal/dynamicLib.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/dynamicLib.h 2014-05-08 22:38:03.638111454 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/dynAnyImpl.h omniORB-4.2.0-new/include/omniORB4/internal/dynAnyImpl.h
+--- omniORB-4.2.0/include/omniORB4/internal/dynAnyImpl.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/dynAnyImpl.h 2014-05-08 22:38:03.654111810 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/excepthandler.h omniORB-4.2.0-new/include/omniORB4/internal/excepthandler.h
+--- omniORB-4.2.0/include/omniORB4/internal/excepthandler.h 2014-03-11 17:06:40.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/internal/excepthandler.h 2014-05-08 22:38:03.641111521 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/exceptiondefs.h omniORB-4.2.0-new/include/omniORB4/internal/exceptiondefs.h
+--- omniORB-4.2.0/include/omniORB4/internal/exceptiondefs.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/exceptiondefs.h 2014-05-08 22:38:03.651111743 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/giopBiDir.h omniORB-4.2.0-new/include/omniORB4/internal/giopBiDir.h
+--- omniORB-4.2.0/include/omniORB4/internal/giopBiDir.h 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/giopBiDir.h 2014-05-08 22:38:03.646111632 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/GIOP_C.h omniORB-4.2.0-new/include/omniORB4/internal/GIOP_C.h
+--- omniORB-4.2.0/include/omniORB4/internal/GIOP_C.h 2013-04-12 15:38:30.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/GIOP_C.h 2014-05-08 22:38:03.642111543 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/giopMonitor.h omniORB-4.2.0-new/include/omniORB4/internal/giopMonitor.h
+--- omniORB-4.2.0/include/omniORB4/internal/giopMonitor.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/giopMonitor.h 2014-05-08 22:38:03.630111276 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/giopRendezvouser.h omniORB-4.2.0-new/include/omniORB4/internal/giopRendezvouser.h
+--- omniORB-4.2.0/include/omniORB4/internal/giopRendezvouser.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/giopRendezvouser.h 2014-05-08 22:38:03.626111187 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/giopRope.h omniORB-4.2.0-new/include/omniORB4/internal/giopRope.h
+--- omniORB-4.2.0/include/omniORB4/internal/giopRope.h 2014-04-17 17:41:04.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/giopRope.h 2014-05-08 22:38:03.634111365 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/giopServer.h omniORB-4.2.0-new/include/omniORB4/internal/giopServer.h
+--- omniORB-4.2.0/include/omniORB4/internal/giopServer.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/giopServer.h 2014-05-08 22:38:03.647111655 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/GIOP_S.h omniORB-4.2.0-new/include/omniORB4/internal/GIOP_S.h
+--- omniORB-4.2.0/include/omniORB4/internal/GIOP_S.h 2013-04-12 15:38:30.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/GIOP_S.h 2014-05-08 22:38:03.629111253 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/giopStrandFlags.h omniORB-4.2.0-new/include/omniORB4/internal/giopStrandFlags.h
+--- omniORB-4.2.0/include/omniORB4/internal/giopStrandFlags.h 2013-10-29 19:17:16.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/internal/giopStrandFlags.h 2014-05-08 22:38:03.630111276 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/giopStrand.h omniORB-4.2.0-new/include/omniORB4/internal/giopStrand.h
+--- omniORB-4.2.0/include/omniORB4/internal/giopStrand.h 2013-06-12 16:12:48.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/giopStrand.h 2014-05-08 22:38:03.633111343 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/giopStream.h omniORB-4.2.0-new/include/omniORB4/internal/giopStream.h
+--- omniORB-4.2.0/include/omniORB4/internal/giopStream.h 2013-08-29 13:56:48.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/giopStream.h 2014-05-08 22:38:03.639111477 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/giopStreamImpl.h omniORB-4.2.0-new/include/omniORB4/internal/giopStreamImpl.h
+--- omniORB-4.2.0/include/omniORB4/internal/giopStreamImpl.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/giopStreamImpl.h 2014-05-08 22:38:03.635111387 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/giopWorker.h omniORB-4.2.0-new/include/omniORB4/internal/giopWorker.h
+--- omniORB-4.2.0/include/omniORB4/internal/giopWorker.h 2013-02-12 23:58:10.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/internal/giopWorker.h 2014-05-08 22:38:03.629111253 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/initialiser.h omniORB-4.2.0-new/include/omniORB4/internal/initialiser.h
+--- omniORB-4.2.0/include/omniORB4/internal/initialiser.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/initialiser.h 2014-05-08 22:38:03.632111321 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/initRefs.h omniORB-4.2.0-new/include/omniORB4/internal/initRefs.h
+--- omniORB-4.2.0/include/omniORB4/internal/initRefs.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/initRefs.h 2014-05-08 22:38:03.642111543 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/inProcessIdentity.h omniORB-4.2.0-new/include/omniORB4/internal/inProcessIdentity.h
+--- omniORB-4.2.0/include/omniORB4/internal/inProcessIdentity.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/inProcessIdentity.h 2014-05-08 22:38:03.656111855 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/interceptors.h omniORB-4.2.0-new/include/omniORB4/internal/interceptors.h
+--- omniORB-4.2.0/include/omniORB4/internal/interceptors.h 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/interceptors.h 2014-05-08 22:38:03.642111543 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/invoker.h omniORB-4.2.0-new/include/omniORB4/internal/invoker.h
+--- omniORB-4.2.0/include/omniORB4/internal/invoker.h 2013-02-12 23:58:10.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/internal/invoker.h 2014-05-08 22:38:03.641111521 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/libcWrapper.h omniORB-4.2.0-new/include/omniORB4/internal/libcWrapper.h
+--- omniORB-4.2.0/include/omniORB4/internal/libcWrapper.h 2010-08-10 19:20:21.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/libcWrapper.h 2014-05-08 22:38:03.656111855 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/localIdentity.h omniORB-4.2.0-new/include/omniORB4/internal/localIdentity.h
+--- omniORB-4.2.0/include/omniORB4/internal/localIdentity.h 2010-11-03 12:16:40.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/internal/localIdentity.h 2014-05-08 22:38:03.629111253 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/objectAdapter.h omniORB-4.2.0-new/include/omniORB4/internal/objectAdapter.h
+--- omniORB-4.2.0/include/omniORB4/internal/objectAdapter.h 2013-07-08 14:46:13.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/objectAdapter.h 2014-05-08 22:38:03.636111409 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/objectStub.h omniORB-4.2.0-new/include/omniORB4/internal/objectStub.h
+--- omniORB-4.2.0/include/omniORB4/internal/objectStub.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/objectStub.h 2014-05-08 22:38:03.635111387 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/objectTable.h omniORB-4.2.0-new/include/omniORB4/internal/objectTable.h
+--- omniORB-4.2.0/include/omniORB4/internal/objectTable.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/objectTable.h 2014-05-08 22:38:03.651111743 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/omniCurrent.h omniORB-4.2.0-new/include/omniORB4/internal/omniCurrent.h
+--- omniORB-4.2.0/include/omniORB4/internal/omniCurrent.h 2012-12-21 17:26:15.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/internal/omniCurrent.h 2014-05-08 22:38:03.646111632 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/omniIdentity.h omniORB-4.2.0-new/include/omniORB4/internal/omniIdentity.h
+--- omniORB-4.2.0/include/omniORB4/internal/omniIdentity.h 2014-04-17 17:41:04.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/omniIdentity.h 2014-05-08 22:38:03.638111454 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/orbOptions.h omniORB-4.2.0-new/include/omniORB4/internal/orbOptions.h
+--- omniORB-4.2.0/include/omniORB4/internal/orbOptions.h 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/orbOptions.h 2014-05-08 22:38:03.640111499 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/orbParameters.h omniORB-4.2.0-new/include/omniORB4/internal/orbParameters.h
+--- omniORB-4.2.0/include/omniORB4/internal/orbParameters.h 2014-04-17 18:32:49.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/orbParameters.h 2014-05-08 22:38:03.645111610 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/poacurrentimpl.h omniORB-4.2.0-new/include/omniORB4/internal/poacurrentimpl.h
+--- omniORB-4.2.0/include/omniORB4/internal/poacurrentimpl.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/poacurrentimpl.h 2014-05-08 22:38:03.645111610 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/poaimpl.h omniORB-4.2.0-new/include/omniORB4/internal/poaimpl.h
+--- omniORB-4.2.0/include/omniORB4/internal/poaimpl.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/poaimpl.h 2014-05-08 22:38:03.628111231 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/poamanager.h omniORB-4.2.0-new/include/omniORB4/internal/poamanager.h
+--- omniORB-4.2.0/include/omniORB4/internal/poamanager.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/poamanager.h 2014-05-08 22:38:03.637111431 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/pseudo.h omniORB-4.2.0-new/include/omniORB4/internal/pseudo.h
+--- omniORB-4.2.0/include/omniORB4/internal/pseudo.h 2012-02-24 11:43:54.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/internal/pseudo.h 2014-05-08 22:38:03.633111343 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/remoteIdentity.h omniORB-4.2.0-new/include/omniORB4/internal/remoteIdentity.h
+--- omniORB-4.2.0/include/omniORB4/internal/remoteIdentity.h 2014-04-17 17:41:04.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/remoteIdentity.h 2014-05-08 22:38:03.635111387 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/request.h omniORB-4.2.0-new/include/omniORB4/internal/request.h
+--- omniORB-4.2.0/include/omniORB4/internal/request.h 2013-12-31 00:23:27.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/internal/request.h 2014-05-08 22:38:03.643111565 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/rmutex.h omniORB-4.2.0-new/include/omniORB4/internal/rmutex.h
+--- omniORB-4.2.0/include/omniORB4/internal/rmutex.h 2005-01-07 00:11:24.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/internal/rmutex.h 2014-05-08 22:38:03.634111365 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/shutdownIdentity.h omniORB-4.2.0-new/include/omniORB4/internal/shutdownIdentity.h
+--- omniORB-4.2.0/include/omniORB4/internal/shutdownIdentity.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/shutdownIdentity.h 2014-05-08 22:38:03.645111610 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/SocketCollection.h omniORB-4.2.0-new/include/omniORB4/internal/SocketCollection.h
+--- omniORB-4.2.0/include/omniORB4/internal/SocketCollection.h 2013-05-23 18:39:39.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/SocketCollection.h 2014-05-08 22:38:03.631111298 +0200
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/tcParser.h omniORB-4.2.0-new/include/omniORB4/internal/tcParser.h
+--- omniORB-4.2.0/include/omniORB4/internal/tcParser.h 2009-05-06 18:16:18.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/tcParser.h 2014-05-08 22:38:03.647111655 +0200
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/tcpSocket.h omniORB-4.2.0-new/include/omniORB4/internal/tcpSocket.h
+--- omniORB-4.2.0/include/omniORB4/internal/tcpSocket.h 2013-05-23 18:39:39.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/tcpSocket.h 2014-05-08 22:38:03.655111833 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/transportRules.h omniORB-4.2.0-new/include/omniORB4/internal/transportRules.h
+--- omniORB-4.2.0/include/omniORB4/internal/transportRules.h 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/transportRules.h 2014-05-08 22:38:03.632111321 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/typecode.h omniORB-4.2.0-new/include/omniORB4/internal/typecode.h
+--- omniORB-4.2.0/include/omniORB4/internal/typecode.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/typecode.h 2014-05-08 22:38:03.650111721 +0200
+@@ -22,8 +22,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/unknownValue.h omniORB-4.2.0-new/include/omniORB4/internal/unknownValue.h
+--- omniORB-4.2.0/include/omniORB4/internal/unknownValue.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/unknownValue.h 2014-05-08 22:38:03.637111431 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/internal/valueTrackerImpl.h omniORB-4.2.0-new/include/omniORB4/internal/valueTrackerImpl.h
+--- omniORB-4.2.0/include/omniORB4/internal/valueTrackerImpl.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/internal/valueTrackerImpl.h 2014-05-08 22:38:03.641111521 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/IOP_C.h omniORB-4.2.0-new/include/omniORB4/IOP_C.h
+--- omniORB-4.2.0/include/omniORB4/IOP_C.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/IOP_C.h 2014-05-08 22:38:03.658111899 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/IOP.h omniORB-4.2.0-new/include/omniORB4/IOP.h
+--- omniORB-4.2.0/include/omniORB4/IOP.h 2013-02-22 17:44:47.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/IOP.h 2014-05-08 22:38:03.694112701 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/IOP_S.h omniORB-4.2.0-new/include/omniORB4/IOP_S.h
+--- omniORB-4.2.0/include/omniORB4/IOP_S.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/IOP_S.h 2014-05-08 22:38:03.693112679 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/linkHacks.h omniORB-4.2.0-new/include/omniORB4/linkHacks.h
+--- omniORB-4.2.0/include/omniORB4/linkHacks.h 2009-09-22 18:42:11.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/linkHacks.h 2014-05-08 22:38:03.695112723 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/minorCode.h omniORB-4.2.0-new/include/omniORB4/minorCode.h
+--- omniORB-4.2.0/include/omniORB4/minorCode.h 2012-12-31 15:57:16.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/minorCode.h 2014-05-08 22:38:03.666112077 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/objTracker.h omniORB-4.2.0-new/include/omniORB4/objTracker.h
+--- omniORB-4.2.0/include/omniORB4/objTracker.h 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/objTracker.h 2014-05-08 22:38:03.609110808 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniAsyncInvoker.h omniORB-4.2.0-new/include/omniORB4/omniAsyncInvoker.h
+--- omniORB-4.2.0/include/omniORB4/omniAsyncInvoker.h 2013-02-12 23:58:10.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/omniAsyncInvoker.h 2014-05-08 22:38:03.612110875 +0200
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // *** PROPRIETARY INTERFACE ***
+diff -rupN omniORB-4.2.0/include/omniORB4/omniConnectionMgmt.h omniORB-4.2.0-new/include/omniORB4/omniConnectionMgmt.h
+--- omniORB-4.2.0/include/omniORB4/omniConnectionMgmt.h 2006-07-26 19:40:32.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniConnectionMgmt.h 2014-05-08 22:38:03.614110919 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // Proprietary omniORB connection management API
+diff -rupN omniORB-4.2.0/include/omniORB4/omniInterceptors.h omniORB-4.2.0-new/include/omniORB4/omniInterceptors.h
+--- omniORB-4.2.0/include/omniORB4/omniInterceptors.h 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniInterceptors.h 2014-05-08 22:38:03.662111989 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniInternal.h omniORB-4.2.0-new/include/omniORB4/omniInternal.h
+--- omniORB-4.2.0/include/omniORB4/omniInternal.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniInternal.h 2014-05-08 22:38:03.689112590 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniIOR.h omniORB-4.2.0-new/include/omniORB4/omniIOR.h
+--- omniORB-4.2.0/include/omniORB4/omniIOR.h 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniIOR.h 2014-05-08 22:38:03.659111921 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniObjKey.h omniORB-4.2.0-new/include/omniORB4/omniObjKey.h
+--- omniORB-4.2.0/include/omniORB4/omniObjKey.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniObjKey.h 2014-05-08 22:38:03.613110897 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniObjRef.h omniORB-4.2.0-new/include/omniORB4/omniObjRef.h
+--- omniORB-4.2.0/include/omniORB4/omniObjRef.h 2014-04-17 17:41:04.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniObjRef.h 2014-05-08 22:38:03.679112367 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniORBcompat.h omniORB-4.2.0-new/include/omniORB4/omniORBcompat.h
+--- omniORB-4.2.0/include/omniORB4/omniORBcompat.h 2004-10-13 20:00:33.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniORBcompat.h 2014-05-08 22:38:03.609110808 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniORB.h omniORB-4.2.0-new/include/omniORB4/omniORB.h
+--- omniORB-4.2.0/include/omniORB4/omniORB.h 2014-03-11 17:06:40.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/omniORB.h 2014-05-08 22:38:03.686112523 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniPolicy.h omniORB-4.2.0-new/include/omniORB4/omniPolicy.h
+--- omniORB-4.2.0/include/omniORB4/omniPolicy.h 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniPolicy.h 2014-05-08 22:38:03.689112590 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniServant.h omniORB-4.2.0-new/include/omniORB4/omniServant.h
+--- omniORB-4.2.0/include/omniORB4/omniServant.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniServant.h 2014-05-08 22:38:03.620111053 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniServer.h omniORB-4.2.0-new/include/omniORB4/omniServer.h
+--- omniORB-4.2.0/include/omniORB4/omniServer.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniServer.h 2014-05-08 22:38:03.696112746 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniTransport.h omniORB-4.2.0-new/include/omniORB4/omniTransport.h
+--- omniORB-4.2.0/include/omniORB4/omniTransport.h 2014-04-17 17:41:04.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniTransport.h 2014-05-08 22:38:03.671112189 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniURI.h omniORB-4.2.0-new/include/omniORB4/omniURI.h
+--- omniORB-4.2.0/include/omniORB4/omniURI.h 2010-08-10 19:20:21.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniURI.h 2014-05-08 22:38:03.612110875 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniutilities.h omniORB-4.2.0-new/include/omniORB4/omniutilities.h
+--- omniORB-4.2.0/include/omniORB4/omniutilities.h 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/omniutilities.h 2014-05-08 22:38:03.697112768 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/omniZIOP.h omniORB-4.2.0-new/include/omniORB4/omniZIOP.h
+--- omniORB-4.2.0/include/omniORB4/omniZIOP.h 2012-12-31 15:57:16.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/omniZIOP.h 2014-05-08 22:38:03.685112501 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // ZIOP support
+diff -rupN omniORB-4.2.0/include/omniORB4/optionalFeatures.h omniORB-4.2.0-new/include/omniORB4/optionalFeatures.h
+--- omniORB-4.2.0/include/omniORB4/optionalFeatures.h 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/optionalFeatures.h 2014-05-08 22:38:03.679112367 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/poa_defs.h omniORB-4.2.0-new/include/omniORB4/poa_defs.h
+--- omniORB-4.2.0/include/omniORB4/poa_defs.h 2012-02-24 11:45:34.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/poa_defs.h 2014-05-08 22:38:03.661111966 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/include/omniORB4/poa.h omniORB-4.2.0-new/include/omniORB4/poa.h
+--- omniORB-4.2.0/include/omniORB4/poa.h 2012-02-24 11:45:34.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/poa.h 2014-05-08 22:38:03.702112879 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/poa_poa.h omniORB-4.2.0-new/include/omniORB4/poa_poa.h
+--- omniORB-4.2.0/include/omniORB4/poa_poa.h 2012-02-24 11:45:34.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/poa_poa.h 2014-05-08 22:38:03.690112612 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/proxyFactory.h omniORB-4.2.0-new/include/omniORB4/proxyFactory.h
+--- omniORB-4.2.0/include/omniORB4/proxyFactory.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/proxyFactory.h 2014-05-08 22:38:03.695112723 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/seqTemplatedecls.h omniORB-4.2.0-new/include/omniORB4/seqTemplatedecls.h
+--- omniORB-4.2.0/include/omniORB4/seqTemplatedecls.h 2009-08-28 13:11:24.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/seqTemplatedecls.h 2014-05-08 22:38:03.625111165 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/seqTemplatedefns.h omniORB-4.2.0-new/include/omniORB4/seqTemplatedefns.h
+--- omniORB-4.2.0/include/omniORB4/seqTemplatedefns.h 2009-08-28 13:11:24.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/seqTemplatedefns.h 2014-05-08 22:38:03.699112813 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/sslContext.h omniORB-4.2.0-new/include/omniORB4/sslContext.h
+--- omniORB-4.2.0/include/omniORB4/sslContext.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/sslContext.h 2014-05-08 22:38:03.672112211 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/streamOperators.h omniORB-4.2.0-new/include/omniORB4/streamOperators.h
+--- omniORB-4.2.0/include/omniORB4/streamOperators.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/streamOperators.h 2014-05-08 22:38:03.614110919 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/stringtypes.h omniORB-4.2.0-new/include/omniORB4/stringtypes.h
+--- omniORB-4.2.0/include/omniORB4/stringtypes.h 2013-01-11 18:47:52.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/stringtypes.h 2014-05-08 22:38:03.670112167 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/templatedecls.h omniORB-4.2.0-new/include/omniORB4/templatedecls.h
+--- omniORB-4.2.0/include/omniORB4/templatedecls.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/templatedecls.h 2014-05-08 22:38:03.684112479 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/templatedefns.h omniORB-4.2.0-new/include/omniORB4/templatedefns.h
+--- omniORB-4.2.0/include/omniORB4/templatedefns.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/templatedefns.h 2014-05-08 22:38:03.663112011 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/tracedthread.h omniORB-4.2.0-new/include/omniORB4/tracedthread.h
+--- omniORB-4.2.0/include/omniORB4/tracedthread.h 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/tracedthread.h 2014-05-08 22:38:03.611110853 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/userexception.h omniORB-4.2.0-new/include/omniORB4/userexception.h
+--- omniORB-4.2.0/include/omniORB4/userexception.h 2011-01-06 15:39:47.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/userexception.h 2014-05-08 22:38:03.680112389 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/valueFactoryManager.h omniORB-4.2.0-new/include/omniORB4/valueFactoryManager.h
+--- omniORB-4.2.0/include/omniORB4/valueFactoryManager.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/valueFactoryManager.h 2014-05-08 22:38:03.673112233 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/valueTemplatedecls.h omniORB-4.2.0-new/include/omniORB4/valueTemplatedecls.h
+--- omniORB-4.2.0/include/omniORB4/valueTemplatedecls.h 2009-09-22 18:42:11.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/valueTemplatedecls.h 2014-05-08 22:38:03.692112657 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/valueTemplatedefns.h omniORB-4.2.0-new/include/omniORB4/valueTemplatedefns.h
+--- omniORB-4.2.0/include/omniORB4/valueTemplatedefns.h 2009-08-28 13:11:24.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/valueTemplatedefns.h 2014-05-08 22:38:03.620111053 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/valueType.h omniORB-4.2.0-new/include/omniORB4/valueType.h
+--- omniORB-4.2.0/include/omniORB4/valueType.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/valueType.h 2014-05-08 22:38:03.681112411 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/wstringtypes.h omniORB-4.2.0-new/include/omniORB4/wstringtypes.h
+--- omniORB-4.2.0/include/omniORB4/wstringtypes.h 2013-01-11 18:47:52.000000000 +0100
++++ omniORB-4.2.0-new/include/omniORB4/wstringtypes.h 2014-05-08 22:38:03.705112947 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/include/omniORB4/ziopStubs.h omniORB-4.2.0-new/include/omniORB4/ziopStubs.h
+--- omniORB-4.2.0/include/omniORB4/ziopStubs.h 2013-07-24 15:24:12.000000000 +0200
++++ omniORB-4.2.0-new/include/omniORB4/ziopStubs.h 2014-05-08 22:38:03.667112100 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // ZIOP stubs
+diff -rupN omniORB-4.2.0/include/omnithread/atomic.h omniORB-4.2.0-new/include/omnithread/atomic.h
+--- omniORB-4.2.0/include/omnithread/atomic.h 2012-08-16 11:49:19.000000000 +0200
++++ omniORB-4.2.0-new/include/omnithread/atomic.h 2014-05-08 22:38:03.707112991 +0200
+@@ -18,8 +18,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ //
+diff -rupN omniORB-4.2.0/include/omnithread/nt.h omniORB-4.2.0-new/include/omnithread/nt.h
+--- omniORB-4.2.0/include/omnithread/nt.h 2009-05-06 18:16:18.000000000 +0200
++++ omniORB-4.2.0-new/include/omnithread/nt.h 2014-05-08 22:38:03.707112991 +0200
+@@ -18,8 +18,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // OMNI thread implementation classes for NT threads.
+diff -rupN omniORB-4.2.0/include/omnithread/posix.h omniORB-4.2.0-new/include/omnithread/posix.h
+--- omniORB-4.2.0/include/omnithread/posix.h 2012-04-14 11:48:18.000000000 +0200
++++ omniORB-4.2.0-new/include/omnithread/posix.h 2014-05-08 22:38:03.707112991 +0200
+@@ -18,8 +18,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // OMNI thread implementation classes for posix threads
+diff -rupN omniORB-4.2.0/include/omnithread/pthread_nt.h omniORB-4.2.0-new/include/omnithread/pthread_nt.h
+--- omniORB-4.2.0/include/omnithread/pthread_nt.h 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/include/omnithread/pthread_nt.h 2014-05-08 22:38:03.708113013 +0200
+@@ -17,8 +17,8 @@
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+- 02111-1307, USA
++ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ 02110-1301, USA
+
+ Posix Threads implementation for Windows NT, version 4.0
+ */
+diff -rupN omniORB-4.2.0/include/omnithread.h omniORB-4.2.0-new/include/omnithread.h
+--- omniORB-4.2.0/include/omnithread.h 2013-02-12 23:52:55.000000000 +0100
++++ omniORB-4.2.0-new/include/omnithread.h 2014-05-08 22:38:03.709113035 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ //
+diff -rupN omniORB-4.2.0/src/appl/omniMapper/omniMapper.cc omniORB-4.2.0-new/src/appl/omniMapper/omniMapper.cc
+--- omniORB-4.2.0/src/appl/omniMapper/omniMapper.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/appl/omniMapper/omniMapper.cc 2014-05-08 22:38:03.497108314 +0200
+@@ -18,8 +18,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+
+ #include <omniORB4/CORBA.h>
+ #include <stdlib.h>
+diff -rupN omniORB-4.2.0/src/appl/omniNames/BindingIterator_i.h omniORB-4.2.0-new/src/appl/omniNames/BindingIterator_i.h
+--- omniORB-4.2.0/src/appl/omniNames/BindingIterator_i.h 2013-02-22 17:42:44.000000000 +0100
++++ omniORB-4.2.0-new/src/appl/omniNames/BindingIterator_i.h 2014-05-08 22:38:03.499108359 +0200
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/omniNames/INSMapper.h omniORB-4.2.0-new/src/appl/omniNames/INSMapper.h
+--- omniORB-4.2.0/src/appl/omniNames/INSMapper.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/appl/omniNames/INSMapper.h 2014-05-08 22:38:03.506108514 +0200
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/omniNames/log.cc omniORB-4.2.0-new/src/appl/omniNames/log.cc
+--- omniORB-4.2.0/src/appl/omniNames/log.cc 2014-03-11 16:59:44.000000000 +0100
++++ omniORB-4.2.0-new/src/appl/omniNames/log.cc 2014-05-08 22:38:03.503108447 +0200
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/omniNames/log.h omniORB-4.2.0-new/src/appl/omniNames/log.h
+--- omniORB-4.2.0/src/appl/omniNames/log.h 2013-02-22 17:42:44.000000000 +0100
++++ omniORB-4.2.0-new/src/appl/omniNames/log.h 2014-05-08 22:38:03.499108359 +0200
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/omniNames/NamingContext_i.cc omniORB-4.2.0-new/src/appl/omniNames/NamingContext_i.cc
+--- omniORB-4.2.0/src/appl/omniNames/NamingContext_i.cc 2013-02-22 17:42:44.000000000 +0100
++++ omniORB-4.2.0-new/src/appl/omniNames/NamingContext_i.cc 2014-05-08 22:38:03.500108380 +0200
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/omniNames/NamingContext_i.h omniORB-4.2.0-new/src/appl/omniNames/NamingContext_i.h
+--- omniORB-4.2.0/src/appl/omniNames/NamingContext_i.h 2013-02-22 17:42:44.000000000 +0100
++++ omniORB-4.2.0-new/src/appl/omniNames/NamingContext_i.h 2014-05-08 22:38:03.504108469 +0200
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/omniNames/ObjectBinding.h omniORB-4.2.0-new/src/appl/omniNames/ObjectBinding.h
+--- omniORB-4.2.0/src/appl/omniNames/ObjectBinding.h 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/appl/omniNames/ObjectBinding.h 2014-05-08 22:38:03.505108492 +0200
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/omniNames/omniNames.cc omniORB-4.2.0-new/src/appl/omniNames/omniNames.cc
+--- omniORB-4.2.0/src/appl/omniNames/omniNames.cc 2013-04-12 17:35:37.000000000 +0200
++++ omniORB-4.2.0-new/src/appl/omniNames/omniNames.cc 2014-05-08 22:38:03.499108359 +0200
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/omniNames/omniNames.h omniORB-4.2.0-new/src/appl/omniNames/omniNames.h
+--- omniORB-4.2.0/src/appl/omniNames/omniNames.h 2013-02-22 17:42:44.000000000 +0100
++++ omniORB-4.2.0-new/src/appl/omniNames/omniNames.h 2014-05-08 22:38:03.504108469 +0200
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/omniNames/omniNamesWin.cc omniORB-4.2.0-new/src/appl/omniNames/omniNamesWin.cc
+--- omniORB-4.2.0/src/appl/omniNames/omniNamesWin.cc 2013-12-20 12:34:45.000000000 +0100
++++ omniORB-4.2.0-new/src/appl/omniNames/omniNamesWin.cc 2014-05-08 22:38:03.506108514 +0200
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/omniNames/ReadersWritersLock.h omniORB-4.2.0-new/src/appl/omniNames/ReadersWritersLock.h
+--- omniORB-4.2.0/src/appl/omniNames/ReadersWritersLock.h 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/appl/omniNames/ReadersWritersLock.h 2014-05-08 22:38:03.504108469 +0200
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/appl/utils/catior/catior.cc omniORB-4.2.0-new/src/appl/utils/catior/catior.cc
+--- omniORB-4.2.0/src/appl/utils/catior/catior.cc 2013-10-29 19:17:16.000000000 +0100
++++ omniORB-4.2.0-new/src/appl/utils/catior/catior.cc 2014-05-08 22:38:03.493108224 +0200
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+ //
+diff -rupN omniORB-4.2.0/src/appl/utils/convertior/convertior.cc omniORB-4.2.0-new/src/appl/utils/convertior/convertior.cc
+--- omniORB-4.2.0/src/appl/utils/convertior/convertior.cc 2009-05-28 11:30:13.000000000 +0200
++++ omniORB-4.2.0-new/src/appl/utils/convertior/convertior.cc 2014-05-08 22:38:03.489108136 +0200
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+ //
+diff -rupN omniORB-4.2.0/src/appl/utils/genior/genior.cc omniORB-4.2.0-new/src/appl/utils/genior/genior.cc
+--- omniORB-4.2.0/src/appl/utils/genior/genior.cc 2009-05-28 11:30:13.000000000 +0200
++++ omniORB-4.2.0-new/src/appl/utils/genior/genior.cc 2014-05-08 22:38:03.494108246 +0200
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+ //
+diff -rupN omniORB-4.2.0/src/appl/utils/nameclt/nameclt.cc omniORB-4.2.0-new/src/appl/utils/nameclt/nameclt.cc
+--- omniORB-4.2.0/src/appl/utils/nameclt/nameclt.cc 2005-06-08 11:35:37.000000000 +0200
++++ omniORB-4.2.0-new/src/appl/utils/nameclt/nameclt.cc 2014-05-08 22:38:03.496108291 +0200
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/codesets/cs-037.cc omniORB-4.2.0-new/src/lib/omniORB/codesets/cs-037.cc
+--- omniORB-4.2.0/src/lib/omniORB/codesets/cs-037.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/codesets/cs-037.cc 2014-05-08 22:38:03.376105619 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/codesets/cs-500.cc omniORB-4.2.0-new/src/lib/omniORB/codesets/cs-500.cc
+--- omniORB-4.2.0/src/lib/omniORB/codesets/cs-500.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/codesets/cs-500.cc 2014-05-08 22:38:03.356105173 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/codesets/cs-EDF-4.cc omniORB-4.2.0-new/src/lib/omniORB/codesets/cs-EDF-4.cc
+--- omniORB-4.2.0/src/lib/omniORB/codesets/cs-EDF-4.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/codesets/cs-EDF-4.cc 2014-05-08 22:38:03.392105975 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/codesets/cs-UCS-4.cc omniORB-4.2.0-new/src/lib/omniORB/codesets/cs-UCS-4.cc
+--- omniORB-4.2.0/src/lib/omniORB/codesets/cs-UCS-4.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/codesets/cs-UCS-4.cc 2014-05-08 22:38:03.386105841 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/codesets/omniCodeSets.cc omniORB-4.2.0-new/src/lib/omniORB/codesets/omniCodeSets.cc
+--- omniORB-4.2.0/src/lib/omniORB/codesets/omniCodeSets.cc 2008-08-08 20:45:49.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/codesets/omniCodeSets.cc 2014-05-08 22:38:03.385105819 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/connections/dataStub.cc omniORB-4.2.0-new/src/lib/omniORB/connections/dataStub.cc
+--- omniORB-4.2.0/src/lib/omniORB/connections/dataStub.cc 2006-07-18 18:21:26.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/connections/dataStub.cc 2014-05-08 22:38:03.395106042 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // omniidl generated stub file
+diff -rupN omniORB-4.2.0/src/lib/omniORB/connections/omniConnectionMgmt.cc omniORB-4.2.0-new/src/lib/omniORB/connections/omniConnectionMgmt.cc
+--- omniORB-4.2.0/src/lib/omniORB/connections/omniConnectionMgmt.cc 2014-02-24 17:34:36.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/connections/omniConnectionMgmt.cc 2014-05-08 22:38:03.395106042 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // Proprietary omniORB connection management API
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/abstractBase.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/abstractBase.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/abstractBase.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/abstractBase.cc 2014-05-08 22:38:03.430106822 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/ami.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/ami.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/ami.cc 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/ami.cc 2014-05-08 22:38:03.397106086 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/any.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/any.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/any.cc 2013-12-31 00:22:49.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/any.cc 2014-05-08 22:38:03.406106287 +0200
+@@ -22,8 +22,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/anyStream.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/anyStream.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/anyStream.cc 2013-04-30 19:22:28.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/anyStream.cc 2014-05-08 22:38:03.398106109 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/bootstrapdynstub.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/bootstrapdynstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/bootstrapdynstub.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/bootstrapdynstub.cc 2014-05-08 22:38:03.436106955 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/boxes.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/boxes.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/boxes.cc 2005-01-17 15:33:25.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/boxes.cc 2014-05-08 22:38:03.433106888 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ #include <omniORB4/CORBA.h>
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/constants.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/constants.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/constants.cc 2009-08-28 13:09:39.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/constants.cc 2014-05-08 22:38:03.429106800 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/context.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/context.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/context.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/context.cc 2014-05-08 22:38:03.423106666 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/contextList.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/contextList.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/contextList.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/contextList.cc 2014-05-08 22:38:03.430106822 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/corbaidldynstub.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/corbaidldynstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/corbaidldynstub.cc 2004-07-23 12:31:47.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/corbaidldynstub.cc 2014-05-08 22:38:03.398106109 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/corbaidlstub.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/corbaidlstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/corbaidlstub.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/corbaidlstub.cc 2014-05-08 22:38:03.401106176 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/dynamicImplementation.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/dynamicImplementation.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/dynamicImplementation.cc 2012-04-02 12:04:05.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/dynamicImplementation.cc 2014-05-08 22:38:03.452107312 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/dynamicLib.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/dynamicLib.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/dynamicLib.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/dynamicLib.cc 2014-05-08 22:38:03.437106978 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/dynAny.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/dynAny.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/dynAny.cc 2013-02-08 23:28:33.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/dynAny.cc 2014-05-08 22:38:03.449107244 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/dynAnyNil.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/dynAnyNil.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/dynAnyNil.cc 2005-01-06 17:39:25.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/dynAnyNil.cc 2014-05-08 22:38:03.435106933 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/dynException.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/dynException.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/dynException.cc 2009-05-06 18:16:18.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/dynException.cc 2014-05-08 22:38:03.432106865 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/environment.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/environment.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/environment.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/environment.cc 2014-05-08 22:38:03.399106131 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/exceptionList.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/exceptionList.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/exceptionList.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/exceptionList.cc 2014-05-08 22:38:03.450107267 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/ir.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/ir.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/ir.cc 2005-11-09 13:22:18.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/ir.cc 2014-05-08 22:38:03.397106086 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/irdynstub.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/irdynstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/irdynstub.cc 2004-07-23 12:31:47.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/irdynstub.cc 2014-05-08 22:38:03.421106621 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/irstub.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/irstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/irstub.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/irstub.cc 2014-05-08 22:38:03.426106732 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/messagingstub.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/messagingstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/messagingstub.cc 2012-08-16 11:49:19.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/messagingstub.cc 2014-05-08 22:38:03.399106131 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ #include <omniORB4/CORBA.h>
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/namedValue.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/namedValue.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/namedValue.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/namedValue.cc 2014-05-08 22:38:03.431106844 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/Namingdynstub.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/Namingdynstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/Namingdynstub.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/Namingdynstub.cc 2014-05-08 22:38:03.398106109 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/nvList.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/nvList.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/nvList.cc 2005-07-21 11:09:22.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/nvList.cc 2014-05-08 22:38:03.433106888 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/omniTypedefs.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/omniTypedefs.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/omniTypedefs.cc 2005-01-17 15:44:47.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/omniTypedefs.cc 2014-05-08 22:38:03.432106865 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ #define USE_core_stub_in_nt_dll
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/orbMultiRequest.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/orbMultiRequest.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/orbMultiRequest.cc 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/orbMultiRequest.cc 2014-05-08 22:38:03.437106978 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/poastub.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/poastub.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/poastub.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/poastub.cc 2014-05-08 22:38:03.450107267 +0200
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/policy.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/policy.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/policy.cc 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/policy.cc 2014-05-08 22:38:03.402106198 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/pollablestub.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/pollablestub.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/pollablestub.cc 2011-02-09 15:36:20.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/pollablestub.cc 2014-05-08 22:38:03.451107289 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ #include <omniORB4/CORBA.h>
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/pseudoBase.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/pseudoBase.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/pseudoBase.cc 2012-04-02 12:04:05.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/pseudoBase.cc 2014-05-08 22:38:03.426106732 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/request.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/request.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/request.cc 2013-12-31 00:23:27.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/request.cc 2014-05-08 22:38:03.428106777 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/serverRequest.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/serverRequest.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/serverRequest.cc 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/serverRequest.cc 2014-05-08 22:38:03.437106978 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/tcParser.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/tcParser.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/tcParser.cc 2009-05-06 18:16:18.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/tcParser.cc 2014-05-08 22:38:03.425106710 +0200
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/typecode.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/typecode.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/typecode.cc 2012-04-14 11:48:18.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/typecode.cc 2014-05-08 22:38:03.421106621 +0200
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/unknownUserExn.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/unknownUserExn.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/unknownUserExn.cc 2009-05-06 18:16:18.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/unknownUserExn.cc 2014-05-08 22:38:03.403106219 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/unknownValue.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/unknownValue.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/unknownValue.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/unknownValue.cc 2014-05-08 22:38:03.423106666 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/valueBase.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/valueBase.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/valueBase.cc 2012-02-24 11:43:54.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/valueBase.cc 2014-05-08 22:38:03.398106109 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // ValueBase implementation
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/valueFactory.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/valueFactory.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/valueFactory.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/valueFactory.cc 2014-05-08 22:38:03.401106176 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/valueTracker.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/valueTracker.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/valueTracker.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/valueTracker.cc 2014-05-08 22:38:03.429106800 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/dynamic/valueType.cc omniORB-4.2.0-new/src/lib/omniORB/dynamic/valueType.cc
+--- omniORB-4.2.0/src/lib/omniORB/dynamic/valueType.cc 2013-07-05 15:19:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/dynamic/valueType.cc 2014-05-08 22:38:03.400106154 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/anonObject.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/anonObject.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/anonObject.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/anonObject.cc 2014-05-08 22:38:03.279103458 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/bootstrapstub.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/bootstrapstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/bootstrapstub.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/bootstrapstub.cc 2014-05-08 22:38:03.252102857 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/callDescriptor.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/callDescriptor.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/callDescriptor.cc 2012-04-02 12:04:05.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/callDescriptor.cc 2014-05-08 22:38:03.309104126 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/callHandle.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/callHandle.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/callHandle.cc 2013-05-23 13:54:43.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/callHandle.cc 2014-05-08 22:38:03.323104439 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/cdrMemoryStream.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/cdrMemoryStream.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/cdrMemoryStream.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/cdrMemoryStream.cc 2014-05-08 22:38:03.297103860 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/cdrStreamAdapter.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/cdrStreamAdapter.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/cdrStreamAdapter.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/cdrStreamAdapter.cc 2014-05-08 22:38:03.296103837 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/cdrStream.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/cdrStream.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/cdrStream.cc 2013-08-29 13:57:56.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/cdrStream.cc 2014-05-08 22:38:03.261103057 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/cdrValueChunkStream.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/cdrValueChunkStream.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/cdrValueChunkStream.cc 2012-08-24 11:49:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/cdrValueChunkStream.cc 2014-05-08 22:38:03.346104951 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/codeSets.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/codeSets.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/codeSets.cc 2013-02-22 18:11:37.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/codeSets.cc 2014-05-08 22:38:03.290103704 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/constants.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/constants.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/constants.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/constants.cc 2014-05-08 22:38:03.310104148 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/corbaBoa.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaBoa.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/corbaBoa.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaBoa.cc 2014-05-08 22:38:03.322104417 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/corbaFixed.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaFixed.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/corbaFixed.cc 2012-04-14 11:48:18.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaFixed.cc 2014-05-08 22:38:03.240102590 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/corbaObject.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaObject.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/corbaObject.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaObject.cc 2014-05-08 22:38:03.247102745 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // Implementation of the CORBA::Object interface.
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/corbaOrb.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaOrb.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/corbaOrb.cc 2013-02-12 23:58:10.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaOrb.cc 2014-05-08 22:38:03.336104728 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/corbaString.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaString.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/corbaString.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaString.cc 2014-05-08 22:38:03.336104728 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/corbaWString.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaWString.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/corbaWString.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/corbaWString.cc 2014-05-08 22:38:03.329104572 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/cs-16bit.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/cs-16bit.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/cs-16bit.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/cs-16bit.cc 2014-05-08 22:38:03.343104883 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/cs-8859-1.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/cs-8859-1.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/cs-8859-1.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/cs-8859-1.cc 2014-05-08 22:38:03.318104326 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/cs-8bit.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/cs-8bit.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/cs-8bit.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/cs-8bit.cc 2014-05-08 22:38:03.303103993 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/cs-UTF-16.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/cs-UTF-16.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/cs-UTF-16.cc 2012-04-14 11:48:18.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/cs-UTF-16.cc 2014-05-08 22:38:03.330104595 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/cs-UTF-8.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/cs-UTF-8.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/cs-UTF-8.cc 2014-01-06 17:39:52.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/cs-UTF-8.cc 2014-05-08 22:38:03.281103503 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/current.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/current.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/current.cc 2011-11-05 16:39:28.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/current.cc 2014-05-08 22:38:03.301103948 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/dynamicLib.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/dynamicLib.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/dynamicLib.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/dynamicLib.cc 2014-05-08 22:38:03.332104639 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/exception.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/exception.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/exception.cc 2014-03-11 17:11:28.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/exception.cc 2014-05-08 22:38:03.308104104 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/exceptn.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/exceptn.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/exceptn.cc 2011-05-20 17:07:01.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/exceptn.cc 2014-05-08 22:38:03.355105151 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopBiDir.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopBiDir.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopBiDir.cc 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopBiDir.cc 2014-05-08 22:38:03.312104194 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/GIOP_C.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/GIOP_C.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/GIOP_C.cc 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/GIOP_C.cc 2014-05-08 22:38:03.238102544 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopEndpoint.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopEndpoint.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopEndpoint.cc 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopEndpoint.cc 2014-05-08 22:38:03.303103993 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopImpl10.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopImpl10.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopImpl10.cc 2013-11-11 23:31:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopImpl10.cc 2014-05-08 22:38:03.265103146 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopImpl11.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopImpl11.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopImpl11.cc 2013-11-11 23:31:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopImpl11.cc 2014-05-08 22:38:03.307104082 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopImpl12.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopImpl12.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopImpl12.cc 2014-03-17 12:07:16.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopImpl12.cc 2014-05-08 22:38:03.260103036 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopMonitor.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopMonitor.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopMonitor.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopMonitor.cc 2014-05-08 22:38:03.343104883 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopRendezvouser.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopRendezvouser.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopRendezvouser.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopRendezvouser.cc 2014-05-08 22:38:03.296103837 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopRope.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopRope.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopRope.cc 2014-04-17 17:41:04.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopRope.cc 2014-05-08 22:38:03.236102501 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/GIOP_S.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/GIOP_S.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/GIOP_S.cc 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/GIOP_S.cc 2014-05-08 22:38:03.354105128 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopServer.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopServer.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopServer.cc 2014-04-17 18:32:49.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopServer.cc 2014-05-08 22:38:03.271103280 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopStrand.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopStrand.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopStrand.cc 2013-11-11 23:31:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopStrand.cc 2014-05-08 22:38:03.348104995 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ #include <omniORB4/CORBA.h>
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopStream.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopStream.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopStream.cc 2013-11-11 16:09:09.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopStream.cc 2014-05-08 22:38:03.339104795 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopStreamImpl.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopStreamImpl.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopStreamImpl.cc 2011-11-05 16:39:28.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopStreamImpl.cc 2014-05-08 22:38:03.249102790 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/giopWorker.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopWorker.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/giopWorker.cc 2013-02-12 23:58:10.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/giopWorker.cc 2014-05-08 22:38:03.322104417 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/initRefs.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/initRefs.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/initRefs.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/initRefs.cc 2014-05-08 22:38:03.254102901 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/inProcessIdentity.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/inProcessIdentity.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/inProcessIdentity.cc 2012-04-02 12:04:05.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/inProcessIdentity.cc 2014-05-08 22:38:03.310104148 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/interceptors.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/interceptors.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/interceptors.cc 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/interceptors.cc 2014-05-08 22:38:03.324104460 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/invoker.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/invoker.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/invoker.cc 2014-03-11 17:00:27.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/invoker.cc 2014-05-08 22:38:03.251102835 +0200
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // *** PROPRIETARY INTERFACE ***
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ior.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/ior.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ior.cc 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ior.cc 2014-05-08 22:38:03.300103926 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/libcWrapper.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/libcWrapper.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/libcWrapper.cc 2010-11-03 12:22:32.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/libcWrapper.cc 2014-05-08 22:38:03.316104282 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/localIdentity.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/localIdentity.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/localIdentity.cc 2012-04-02 12:04:05.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/localIdentity.cc 2014-05-08 22:38:03.323104439 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/localObject.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/localObject.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/localObject.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/localObject.cc 2014-05-08 22:38:03.246102723 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/logIOstream.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/logIOstream.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/logIOstream.cc 2012-04-14 11:48:18.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/logIOstream.cc 2014-05-08 22:38:03.319104349 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/minorCode.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/minorCode.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/minorCode.cc 2011-02-09 15:36:20.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/minorCode.cc 2014-05-08 22:38:03.247102745 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/msvcdllstub.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/msvcdllstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/msvcdllstub.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/msvcdllstub.cc 2014-05-08 22:38:03.346104951 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/Namingstub.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/Namingstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/Namingstub.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/Namingstub.cc 2014-05-08 22:38:03.319104349 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/objectAdapter.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/objectAdapter.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/objectAdapter.cc 2012-04-14 11:48:18.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/objectAdapter.cc 2014-05-08 22:38:03.350105039 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/objectStub.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/objectStub.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/objectStub.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/objectStub.cc 2014-05-08 22:38:03.331104617 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/omniIdentity.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniIdentity.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/omniIdentity.cc 2014-04-17 17:41:04.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniIdentity.cc 2014-05-08 22:38:03.254102901 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/omniInternal.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniInternal.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/omniInternal.cc 2013-07-08 14:46:13.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniInternal.cc 2014-05-08 22:38:03.328104550 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/omniIOR.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniIOR.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/omniIOR.cc 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniIOR.cc 2014-05-08 22:38:03.329104572 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/omniObjRef.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniObjRef.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/omniObjRef.cc 2014-04-17 17:41:04.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniObjRef.cc 2014-05-08 22:38:03.315104260 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ #include <omniORB4/CORBA.h>
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/omniORB.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniORB.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/omniORB.cc 2011-11-05 16:39:28.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniORB.cc 2014-05-08 22:38:03.331104617 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/omniPolicy.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniPolicy.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/omniPolicy.cc 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniPolicy.cc 2014-05-08 22:38:03.356105173 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/omniServant.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniServant.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/omniServant.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniServant.cc 2014-05-08 22:38:03.332104639 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/omniTransport.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniTransport.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/omniTransport.cc 2011-11-05 16:39:28.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/omniTransport.cc 2014-05-08 22:38:03.291103725 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/orbOptions.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/orbOptions.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/orbOptions.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/orbOptions.cc 2014-05-08 22:38:03.317104304 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/orbOptionsFile.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/orbOptionsFile.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/orbOptionsFile.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/orbOptionsFile.cc 2014-05-08 22:38:03.343104883 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/orbOptionsReg.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/orbOptionsReg.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/orbOptionsReg.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/orbOptionsReg.cc 2014-05-08 22:38:03.245102701 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/poa.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/poa.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/poa.cc 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/poa.cc 2014-05-08 22:38:03.279103458 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/poamanager.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/poamanager.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/poamanager.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/poamanager.cc 2014-05-08 22:38:03.255102923 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/poastubs.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/poastubs.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/poastubs.cc 2013-03-07 12:08:16.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/poastubs.cc 2014-05-08 22:38:03.342104861 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/policy.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/policy.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/policy.cc 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/policy.cc 2014-05-08 22:38:03.289103681 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/portableserver.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/portableserver.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/portableserver.cc 2013-01-11 18:47:52.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/portableserver.cc 2014-05-08 22:38:03.252102857 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/proxyFactory.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/proxyFactory.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/proxyFactory.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/proxyFactory.cc 2014-05-08 22:38:03.344104906 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/remoteIdentity.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/remoteIdentity.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/remoteIdentity.cc 2014-04-17 17:41:04.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/remoteIdentity.cc 2014-05-08 22:38:03.237102522 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/rmutex.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/rmutex.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/rmutex.cc 2005-07-08 19:04:59.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/rmutex.cc 2014-05-08 22:38:03.349105017 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/shutdownIdentity.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/shutdownIdentity.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/shutdownIdentity.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/shutdownIdentity.cc 2014-05-08 22:38:03.261103057 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/SocketCollection.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/SocketCollection.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/SocketCollection.cc 2013-02-22 18:13:56.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/SocketCollection.cc 2014-05-08 22:38:03.295103815 +0200
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/msvcdllstub.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/msvcdllstub.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/msvcdllstub.cc 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/msvcdllstub.cc 2014-05-08 22:38:03.288103659 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslActive.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslActive.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslActive.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslActive.cc 2014-05-08 22:38:03.283103547 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslAddress.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslAddress.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslAddress.cc 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslAddress.cc 2014-05-08 22:38:03.286103614 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslAddress.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslAddress.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslAddress.h 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslAddress.h 2014-05-08 22:38:03.284103569 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslConnection.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslConnection.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslConnection.cc 2014-04-03 12:58:32.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslConnection.cc 2014-05-08 22:38:03.287103636 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslConnection.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslConnection.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslConnection.h 2013-04-12 17:35:37.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslConnection.h 2014-05-08 22:38:03.285103591 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslContext.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslContext.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslContext.cc 2013-04-12 17:35:37.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslContext.cc 2014-05-08 22:38:03.284103569 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslEndpoint.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslEndpoint.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslEndpoint.cc 2013-04-12 17:35:37.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslEndpoint.cc 2014-05-08 22:38:03.282103525 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslEndpoint.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslEndpoint.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslEndpoint.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslEndpoint.h 2014-05-08 22:38:03.283103547 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslTransportImpl.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslTransportImpl.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslTransportImpl.cc 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslTransportImpl.cc 2014-05-08 22:38:03.288103659 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslTransportImpl.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslTransportImpl.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/ssl/sslTransportImpl.h 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/ssl/sslTransportImpl.h 2014-05-08 22:38:03.285103591 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpActive.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpActive.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpActive.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpActive.cc 2014-05-08 22:38:03.232102412 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpAddress.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpAddress.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpAddress.cc 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpAddress.cc 2014-05-08 22:38:03.231102389 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpAddress.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpAddress.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpAddress.h 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpAddress.h 2014-05-08 22:38:03.234102457 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpConnection.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpConnection.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpConnection.cc 2013-02-22 18:13:56.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpConnection.cc 2014-05-08 22:38:03.230102366 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpConnection.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpConnection.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpConnection.h 2011-11-05 16:39:28.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpConnection.h 2014-05-08 22:38:03.232102412 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpEndpoint.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpEndpoint.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpEndpoint.cc 2013-04-12 17:35:37.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpEndpoint.cc 2014-05-08 22:38:03.231102389 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpEndpoint.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpEndpoint.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpEndpoint.h 2010-08-10 19:20:21.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpEndpoint.h 2014-05-08 22:38:03.234102457 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.cc 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.cc 2014-05-08 22:38:03.233102434 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.h 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.h 2014-05-08 22:38:03.234102457 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tcpSocket.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcpSocket.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tcpSocket.cc 2014-04-17 18:32:49.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tcpSocket.cc 2014-05-08 22:38:03.352105084 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/tracedthread.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/tracedthread.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/tracedthread.cc 2012-04-02 12:04:05.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/tracedthread.cc 2014-05-08 22:38:03.355105151 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/transportRules.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/transportRules.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/transportRules.cc 2013-05-22 16:07:16.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/transportRules.cc 2014-05-08 22:38:03.334104683 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixActive.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixActive.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixActive.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixActive.cc 2014-05-08 22:38:03.241102612 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixAddress.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixAddress.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixAddress.cc 2013-03-07 12:08:37.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixAddress.cc 2014-05-08 22:38:03.242102635 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixAddress.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixAddress.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixAddress.h 2011-11-05 16:39:28.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixAddress.h 2014-05-08 22:38:03.243102657 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixConnection.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixConnection.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixConnection.cc 2013-02-22 18:13:56.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixConnection.cc 2014-05-08 22:38:03.244102679 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixConnection.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixConnection.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixConnection.h 2011-11-05 16:39:28.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixConnection.h 2014-05-08 22:38:03.242102635 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixEndpoint.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixEndpoint.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixEndpoint.cc 2013-02-22 18:13:56.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixEndpoint.cc 2014-05-08 22:38:03.243102657 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixEndpoint.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixEndpoint.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixEndpoint.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixEndpoint.h 2014-05-08 22:38:03.244102679 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixTransportImpl.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixTransportImpl.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixTransportImpl.cc 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixTransportImpl.cc 2014-05-08 22:38:03.241102612 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixTransportImpl.h omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixTransportImpl.h
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/unix/unixTransportImpl.h 2013-07-24 15:21:25.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/unix/unixTransportImpl.h 2014-05-08 22:38:03.241102612 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/orbcore/uri.cc omniORB-4.2.0-new/src/lib/omniORB/orbcore/uri.cc
+--- omniORB-4.2.0/src/lib/omniORB/orbcore/uri.cc 2012-04-14 11:48:18.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/orbcore/uri.cc 2014-05-08 22:38:03.267103191 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/ast.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/ast.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/ast.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/ast.py 2014-05-08 22:38:03.172101075 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/call.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/call.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/call.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/call.py 2014-05-08 22:38:03.176101164 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Produce local callback functions
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/config.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/config.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/config.py 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/config.py 2014-05-08 22:38:03.150100585 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/cxx.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/cxx.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/cxx.py 2012-02-16 00:31:07.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/cxx.py 2014-05-08 22:38:03.176101164 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/descriptor.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/descriptor.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/descriptor.py 2012-02-16 00:31:07.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/descriptor.py 2014-05-08 22:38:03.166100941 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Produce internal descriptors
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/dynskel/__init__.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/dynskel/__init__.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/dynskel/__init__.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/dynskel/__init__.py 2014-05-08 22:38:03.179101231 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/dynskel/main.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/dynskel/main.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/dynskel/main.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/dynskel/main.py 2014-05-08 22:38:03.182101297 +0200
+@@ -21,8 +21,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """Produce the main dynamic skeleton definitions"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/dynskel/template.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/dynskel/template.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/dynskel/template.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/dynskel/template.py 2014-05-08 22:38:03.178101209 +0200
+@@ -21,8 +21,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """C++ templates for the DynSK.cc file"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/dynskel/typecode.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/dynskel/typecode.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/dynskel/typecode.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/dynskel/typecode.py 2014-05-08 22:38:03.181101275 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """Produces the instances of CORBA::TypeCode"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/defs.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/defs.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/defs.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/defs.py 2014-05-08 22:38:03.157100742 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/forward.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/forward.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/forward.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/forward.py 2014-05-08 22:38:03.158100764 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/__init__.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/__init__.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/__init__.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/__init__.py 2014-05-08 22:38:03.165100919 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/marshal.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/marshal.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/marshal.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/marshal.py 2014-05-08 22:38:03.165100919 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/obv.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/obv.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/obv.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/obv.py 2014-05-08 22:38:03.163100875 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/opers.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/opers.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/opers.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/opers.py 2014-05-08 22:38:03.164100897 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/poa.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/poa.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/poa.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/poa.py 2014-05-08 22:38:03.158100764 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/template.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/template.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/template.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/template.py 2014-05-08 22:38:03.162100852 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """C++ templates for the .hh file"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/tie.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/tie.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/header/tie.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/header/tie.py 2014-05-08 22:38:03.163100875 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/id.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/id.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/id.py 2012-02-08 11:23:05.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/id.py 2014-05-08 22:38:03.153100651 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/iface.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/iface.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/iface.py 2013-08-29 13:57:56.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/iface.py 2014-05-08 22:38:03.152100629 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/impl/__init__.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/impl/__init__.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/impl/__init__.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/impl/__init__.py 2014-05-08 22:38:03.146100496 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/impl/main.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/impl/main.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/impl/main.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/impl/main.py 2014-05-08 22:38:03.147100518 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """Produce example interface implementations"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/impl/template.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/impl/template.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/impl/template.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/impl/template.py 2014-05-08 22:38:03.146100496 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/__init__.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/__init__.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/__init__.py 2012-04-02 12:04:05.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/__init__.py 2014-05-08 22:38:03.173101097 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/mangler.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/mangler.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/mangler.py 2012-02-08 11:23:05.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/mangler.py 2014-05-08 22:38:03.173101097 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Produce mangled names for types and operation signatures
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/mapping.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/mapping.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/mapping.py 2003-10-23 13:25:55.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/mapping.py 2014-05-08 22:38:03.153100651 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Abstract base class for C++ type mappings
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/output.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/output.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/output.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/output.py 2014-05-08 22:38:03.172101075 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/skel/__init__.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/skel/__init__.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/skel/__init__.py 2012-02-08 11:23:05.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/skel/__init__.py 2014-05-08 22:38:03.169101008 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/skel/main.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/skel/main.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/skel/main.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/skel/main.py 2014-05-08 22:38:03.170101031 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/skel/poa.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/skel/poa.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/skel/poa.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/skel/poa.py 2014-05-08 22:38:03.166100941 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+
+ """Produce the main POA skeleton definitions"""
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/skel/template.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/skel/template.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/skel/template.py 2013-08-29 13:57:56.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/skel/template.py 2014-05-08 22:38:03.168100986 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """C++ templates for the SK.cc file"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/skutil.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/skutil.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/skutil.py 2013-08-29 13:57:56.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/skutil.py 2014-05-08 22:38:03.154100674 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/support.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/support.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/support.py 2009-05-06 18:16:18.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/support.py 2014-05-08 22:38:03.177101187 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/types.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/types.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/types.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/types.py 2014-05-08 22:38:03.149100563 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/util.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/util.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/util.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/util.py 2014-05-08 22:38:03.171101053 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/value.py omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/value.py
+--- omniORB-4.2.0/src/lib/omniORB/python/omniidl_be/cxx/value.py 2013-01-11 18:47:52.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python/omniidl_be/cxx/value.py 2014-05-08 22:38:03.145100473 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Implementation of ValueType / ValueBox mapping
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/ast.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/ast.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/ast.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/ast.py 2014-05-08 22:38:03.216102056 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/call.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/call.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/call.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/call.py 2014-05-08 22:38:03.220102144 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Produce local callback functions
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/config.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/config.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/config.py 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/config.py 2014-05-08 22:38:03.194101566 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/cxx.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/cxx.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/cxx.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/cxx.py 2014-05-08 22:38:03.221102166 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/descriptor.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/descriptor.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/descriptor.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/descriptor.py 2014-05-08 22:38:03.210101922 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Produce internal descriptors
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/__init__.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/__init__.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/__init__.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/__init__.py 2014-05-08 22:38:03.223102211 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/main.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/main.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/main.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/main.py 2014-05-08 22:38:03.226102278 +0200
+@@ -21,8 +21,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """Produce the main dynamic skeleton definitions"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/template.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/template.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/template.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/template.py 2014-05-08 22:38:03.223102211 +0200
+@@ -21,8 +21,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """C++ templates for the DynSK.cc file"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/typecode.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/typecode.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/typecode.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/dynskel/typecode.py 2014-05-08 22:38:03.225102256 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """Produces the instances of CORBA::TypeCode"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/defs.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/defs.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/defs.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/defs.py 2014-05-08 22:38:03.202101744 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/forward.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/forward.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/forward.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/forward.py 2014-05-08 22:38:03.203101766 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/__init__.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/__init__.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/__init__.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/__init__.py 2014-05-08 22:38:03.209101900 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/marshal.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/marshal.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/marshal.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/marshal.py 2014-05-08 22:38:03.209101900 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/obv.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/obv.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/obv.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/obv.py 2014-05-08 22:38:03.207101855 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/opers.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/opers.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/opers.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/opers.py 2014-05-08 22:38:03.208101877 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/poa.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/poa.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/poa.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/poa.py 2014-05-08 22:38:03.203101766 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/template.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/template.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/template.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/template.py 2014-05-08 22:38:03.206101832 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """C++ templates for the .hh file"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/tie.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/tie.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/header/tie.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/header/tie.py 2014-05-08 22:38:03.207101855 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/id.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/id.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/id.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/id.py 2014-05-08 22:38:03.198101654 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/iface.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/iface.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/iface.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/iface.py 2014-05-08 22:38:03.197101631 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/impl/__init__.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/impl/__init__.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/impl/__init__.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/impl/__init__.py 2014-05-08 22:38:03.190101476 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/impl/main.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/impl/main.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/impl/main.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/impl/main.py 2014-05-08 22:38:03.191101498 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """Produce example interface implementations"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/impl/template.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/impl/template.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/impl/template.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/impl/template.py 2014-05-08 22:38:03.190101476 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/__init__.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/__init__.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/__init__.py 2012-04-02 12:04:05.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/__init__.py 2014-05-08 22:38:03.217102078 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/mangler.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/mangler.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/mangler.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/mangler.py 2014-05-08 22:38:03.218102100 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Produce mangled names for types and operation signatures
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/mapping.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/mapping.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/mapping.py 2003-10-23 13:25:55.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/mapping.py 2014-05-08 22:38:03.198101654 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Abstract base class for C++ type mappings
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/output.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/output.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/output.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/output.py 2014-05-08 22:38:03.216102056 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/skel/__init__.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/skel/__init__.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/skel/__init__.py 2012-02-08 11:23:05.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/skel/__init__.py 2014-05-08 22:38:03.213101988 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/skel/main.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/skel/main.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/skel/main.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/skel/main.py 2014-05-08 22:38:03.214102010 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/skel/poa.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/skel/poa.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/skel/poa.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/skel/poa.py 2014-05-08 22:38:03.210101922 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+
+ """Produce the main POA skeleton definitions"""
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/skel/template.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/skel/template.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/skel/template.py 2013-08-29 13:57:56.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/skel/template.py 2014-05-08 22:38:03.212101966 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ """C++ templates for the SK.cc file"""
+
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/skutil.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/skutil.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/skutil.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/skutil.py 2014-05-08 22:38:03.199101677 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/support.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/support.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/support.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/support.py 2014-05-08 22:38:03.221102166 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/types.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/types.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/types.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/types.py 2014-05-08 22:38:03.194101566 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/util.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/util.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/util.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/util.py 2014-05-08 22:38:03.215102033 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/value.py omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/value.py
+--- omniORB-4.2.0/src/lib/omniORB/python3/omniidl_be/cxx/value.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/python3/omniidl_be/cxx/value.py 2014-05-08 22:38:03.189101453 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Implementation of ValueType / ValueBox mapping
+diff -rupN omniORB-4.2.0/src/lib/omniORB/ziop/messagingStubs.cc omniORB-4.2.0-new/src/lib/omniORB/ziop/messagingStubs.cc
+--- omniORB-4.2.0/src/lib/omniORB/ziop/messagingStubs.cc 2012-12-31 15:57:16.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/ziop/messagingStubs.cc 2014-05-08 22:38:03.453107334 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // Messaging stubs
+diff -rupN omniORB-4.2.0/src/lib/omniORB/ziop/omniZIOP.cc omniORB-4.2.0-new/src/lib/omniORB/ziop/omniZIOP.cc
+--- omniORB-4.2.0/src/lib/omniORB/ziop/omniZIOP.cc 2013-07-24 15:24:12.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/ziop/omniZIOP.cc 2014-05-08 22:38:03.456107400 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // ZIOP support
+diff -rupN omniORB-4.2.0/src/lib/omniORB/ziop/omniZIOPImpl.h omniORB-4.2.0-new/src/lib/omniORB/ziop/omniZIOPImpl.h
+--- omniORB-4.2.0/src/lib/omniORB/ziop/omniZIOPImpl.h 2012-12-31 15:57:16.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/ziop/omniZIOPImpl.h 2014-05-08 22:38:03.453107334 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // ZIOP support
+diff -rupN omniORB-4.2.0/src/lib/omniORB/ziop/ziopStubs.cc omniORB-4.2.0-new/src/lib/omniORB/ziop/ziopStubs.cc
+--- omniORB-4.2.0/src/lib/omniORB/ziop/ziopStubs.cc 2012-12-31 15:57:16.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/ziop/ziopStubs.cc 2014-05-08 22:38:03.452107312 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // ZIOP stubs
+diff -rupN omniORB-4.2.0/src/lib/omniORB/ziop/zlibCompressor.cc omniORB-4.2.0-new/src/lib/omniORB/ziop/zlibCompressor.cc
+--- omniORB-4.2.0/src/lib/omniORB/ziop/zlibCompressor.cc 2012-12-31 15:57:16.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/ziop/zlibCompressor.cc 2014-05-08 22:38:03.457107423 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // zlib compressor
+diff -rupN omniORB-4.2.0/src/lib/omniORB/ziop/zlibCompressor.h omniORB-4.2.0-new/src/lib/omniORB/ziop/zlibCompressor.h
+--- omniORB-4.2.0/src/lib/omniORB/ziop/zlibCompressor.h 2012-12-31 15:57:16.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omniORB/ziop/zlibCompressor.h 2014-05-08 22:38:03.454107356 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // zlib compressor
+diff -rupN omniORB-4.2.0/src/lib/omniORB/ziopdynamic/compressionDynStubs.cc omniORB-4.2.0-new/src/lib/omniORB/ziopdynamic/compressionDynStubs.cc
+--- omniORB-4.2.0/src/lib/omniORB/ziopdynamic/compressionDynStubs.cc 2013-07-24 15:24:12.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/ziopdynamic/compressionDynStubs.cc 2014-05-08 22:38:03.229102344 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // ZIOP dynamic stubs
+diff -rupN omniORB-4.2.0/src/lib/omniORB/ziopdynamic/omniZIOPDynamic.cc omniORB-4.2.0-new/src/lib/omniORB/ziopdynamic/omniZIOPDynamic.cc
+--- omniORB-4.2.0/src/lib/omniORB/ziopdynamic/omniZIOPDynamic.cc 2013-07-24 15:24:12.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/ziopdynamic/omniZIOPDynamic.cc 2014-05-08 22:38:03.228102323 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // ZIOP support that requires Any
+diff -rupN omniORB-4.2.0/src/lib/omniORB/ziopdynamic/ziopDynStubs.cc omniORB-4.2.0-new/src/lib/omniORB/ziopdynamic/ziopDynStubs.cc
+--- omniORB-4.2.0/src/lib/omniORB/ziopdynamic/ziopDynStubs.cc 2013-07-24 15:24:12.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omniORB/ziopdynamic/ziopDynStubs.cc 2014-05-08 22:38:03.229102344 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // ZIOP dynamic stubs
+diff -rupN omniORB-4.2.0/src/lib/omnithread/nt.cc omniORB-4.2.0-new/src/lib/omnithread/nt.cc
+--- omniORB-4.2.0/src/lib/omnithread/nt.cc 2010-03-01 16:59:18.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omnithread/nt.cc 2014-05-08 22:38:03.136100273 +0200
+@@ -18,8 +18,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ //
+diff -rupN omniORB-4.2.0/src/lib/omnithread/posix.cc omniORB-4.2.0-new/src/lib/omnithread/posix.cc
+--- omniORB-4.2.0/src/lib/omnithread/posix.cc 2012-12-31 15:57:16.000000000 +0100
++++ omniORB-4.2.0-new/src/lib/omnithread/posix.cc 2014-05-08 22:38:03.133100207 +0200
+@@ -18,8 +18,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ //
+diff -rupN omniORB-4.2.0/src/lib/omnithread/threaddata.cc omniORB-4.2.0-new/src/lib/omnithread/threaddata.cc
+--- omniORB-4.2.0/src/lib/omnithread/threaddata.cc 2011-04-20 19:24:30.000000000 +0200
++++ omniORB-4.2.0-new/src/lib/omnithread/threaddata.cc 2014-05-08 22:38:03.131100162 +0200
+@@ -18,8 +18,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ // Implementation of per-thread data
+diff -rupN omniORB-4.2.0/src/services/mklib/COS_sysdep.h omniORB-4.2.0-new/src/services/mklib/COS_sysdep.h
+--- omniORB-4.2.0/src/services/mklib/COS_sysdep.h 2005-01-07 00:11:24.000000000 +0100
++++ omniORB-4.2.0-new/src/services/mklib/COS_sysdep.h 2014-05-08 22:38:03.128100095 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // This file is included by COS stub headers.
+diff -rupN omniORB-4.2.0/src/services/mklib/mkBOAlib/COS_sysdep.h omniORB-4.2.0-new/src/services/mklib/mkBOAlib/COS_sysdep.h
+--- omniORB-4.2.0/src/services/mklib/mkBOAlib/COS_sysdep.h 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/services/mklib/mkBOAlib/COS_sysdep.h 2014-05-08 22:38:03.127100073 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // This file is included by COS stub headers.
+diff -rupN omniORB-4.2.0/src/tool/omniidl/COPYING omniORB-4.2.0-new/src/tool/omniidl/COPYING
+--- omniORB-4.2.0/src/tool/omniidl/COPYING 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/COPYING 2014-05-08 22:38:03.114099783 +0200
+@@ -2,7 +2,7 @@
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
++ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+@@ -305,7 +305,7 @@ the "copyright" line and a pointer to wh
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ USA.
+
+ Also add information on how to contact you by electronic and paper mail.
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/cccp/cccp.c omniORB-4.2.0-new/src/tool/omniidl/cxx/cccp/cccp.c
+--- omniORB-4.2.0/src/tool/omniidl/cxx/cccp/cccp.c 2006-08-02 16:26:34.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/cccp/cccp.c 2014-05-08 22:38:03.089099227 +0200
+@@ -15,8 +15,8 @@ GNU General Public License for more deta
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+-Foundation, 59 Temple Place - Suite 330,
+-Boston, MA 02111-1307, USA.
++Foundation, Inc., 51 Franklin St, Fifth Floor,
++Boston, MA 02110-1301, USA.
+
+ In other words, you are welcome to use, share and improve this program.
+ You are forbidden to forbid anyone else to use, share and improve
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/cccp/cexp.y omniORB-4.2.0-new/src/tool/omniidl/cxx/cccp/cexp.y
+--- omniORB-4.2.0/src/tool/omniidl/cxx/cccp/cexp.y 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/cccp/cexp.y 2014-05-08 22:38:03.099099449 +0200
+@@ -13,8 +13,8 @@ GNU General Public License for more deta
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+-Foundation, 59 Temple Place - Suite 330,
+-Boston, MA 02111-1307, USA.
++Foundation, Inc., 51 Franklin St, Fifth Floor,
++Boston, MA 02110-1301, USA.
+
+ In other words, you are welcome to use, share and improve this program.
+ You are forbidden to forbid anyone else to use, share and improve
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/cccp/pcp.h omniORB-4.2.0-new/src/tool/omniidl/cxx/cccp/pcp.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/cccp/pcp.h 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/cccp/pcp.h 2014-05-08 22:38:03.101099494 +0200
+@@ -15,8 +15,8 @@ GNU General Public License for more deta
+
+ You should have received a copy of the GNU General Public License
+ along with GNU CC; see the file COPYING. If not, write to
+-the Free Software Foundation, 59 Temple Place - Suite 330,
+-Boston, MA 02111-1307, USA. */
++the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++Boston, MA 02110-1301, USA. */
+
+
+
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlast.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlast.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlast.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlast.cc 2014-05-08 22:38:03.056098491 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlast.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlast.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlast.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlast.h 2014-05-08 22:38:03.025097801 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlc.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlc.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlc.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlc.cc 2014-05-08 22:38:03.041098157 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlconfig.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlconfig.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlconfig.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlconfig.cc 2014-05-08 22:38:03.101099494 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlconfig.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlconfig.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlconfig.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlconfig.h 2014-05-08 22:38:03.049098335 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idldump.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idldump.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idldump.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idldump.cc 2014-05-08 22:38:03.058098536 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idldump.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idldump.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idldump.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idldump.h 2014-05-08 22:38:03.047098291 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlerr.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlerr.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlerr.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlerr.cc 2014-05-08 22:38:03.043098202 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlerr.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlerr.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlerr.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlerr.h 2014-05-08 22:38:03.037098068 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlexpr.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlexpr.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlexpr.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlexpr.cc 2014-05-08 22:38:03.021097712 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlexpr.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlexpr.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlexpr.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlexpr.h 2014-05-08 22:38:03.112099739 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlfixed.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlfixed.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlfixed.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlfixed.cc 2014-05-08 22:38:03.060098581 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlfixed.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlfixed.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlfixed.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlfixed.h 2014-05-08 22:38:03.012097511 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idl.ll omniORB-4.2.0-new/src/tool/omniidl/cxx/idl.ll
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idl.ll 2009-05-06 18:16:18.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idl.ll 2014-05-08 22:38:03.018097645 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlmath.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlmath.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlmath.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlmath.h 2014-05-08 22:38:03.112099739 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlpython.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlpython.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlpython.cc 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlpython.cc 2014-05-08 22:38:03.041098157 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlrepoId.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlrepoId.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlrepoId.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlrepoId.cc 2014-05-08 22:38:03.044098224 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlrepoId.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlrepoId.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlrepoId.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlrepoId.h 2014-05-08 22:38:03.018097645 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlscope.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlscope.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlscope.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlscope.cc 2014-05-08 22:38:03.016097601 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlscope.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlscope.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlscope.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlscope.h 2014-05-08 22:38:03.048098313 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlsysdep.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlsysdep.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlsysdep.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlsysdep.h 2014-05-08 22:38:03.112099739 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idltype.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idltype.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idltype.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idltype.cc 2014-05-08 22:38:03.047098291 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idltype.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idltype.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idltype.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idltype.h 2014-05-08 22:38:03.049098335 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlutil.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlutil.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlutil.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlutil.cc 2014-05-08 22:38:03.025097801 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlutil.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlutil.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlutil.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlutil.h 2014-05-08 22:38:03.111099717 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlvalidate.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/idlvalidate.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlvalidate.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlvalidate.cc 2014-05-08 22:38:03.043098202 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlvalidate.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlvalidate.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlvalidate.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlvalidate.h 2014-05-08 22:38:03.042098179 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idlvisitor.h omniORB-4.2.0-new/src/tool/omniidl/cxx/idlvisitor.h
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idlvisitor.h 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idlvisitor.h 2014-05-08 22:38:03.042098179 +0200
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/idl.yy omniORB-4.2.0-new/src/tool/omniidl/cxx/idl.yy
+--- omniORB-4.2.0/src/tool/omniidl/cxx/idl.yy 2009-05-06 18:16:18.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/idl.yy 2014-05-08 22:38:03.104099561 +0200
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/lex.yy.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/lex.yy.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/lex.yy.cc 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/lex.yy.cc 2014-05-08 22:38:03.110099695 +0200
+@@ -837,8 +837,8 @@ char *yytext;
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff -rupN omniORB-4.2.0/src/tool/omniidl/cxx/y.tab.cc omniORB-4.2.0-new/src/tool/omniidl/cxx/y.tab.cc
+--- omniORB-4.2.0/src/tool/omniidl/cxx/y.tab.cc 2003-09-04 16:00:35.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/cxx/y.tab.cc 2014-05-08 22:38:03.036098046 +0200
+@@ -991,8 +991,8 @@ static const short yycheck[] =
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA. */
++ Foundation, Inc., 51 Franklin St, Fifth Floor,
++ Boston, MA 02110-1301, USA. */
+
+ /* As a special exception, when this file is copied by Bison into a
+ Bison output file, you may use that output file without restriction.
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/omniidl/idlast.py omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/idlast.py
+--- omniORB-4.2.0/src/tool/omniidl/python/omniidl/idlast.py 2012-08-01 12:36:33.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/idlast.py 2014-05-08 22:38:02.984096888 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/omniidl/idltype.py omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/idltype.py
+--- omniORB-4.2.0/src/tool/omniidl/python/omniidl/idltype.py 2012-08-01 12:36:33.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/idltype.py 2014-05-08 22:38:02.979096777 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/omniidl/idlutil.py omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/idlutil.py
+--- omniORB-4.2.0/src/tool/omniidl/python/omniidl/idlutil.py 2011-02-09 15:36:20.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/idlutil.py 2014-05-08 22:38:02.987096955 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/omniidl/idlvisitor.py omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/idlvisitor.py
+--- omniORB-4.2.0/src/tool/omniidl/python/omniidl/idlvisitor.py 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/idlvisitor.py 2014-05-08 22:38:02.984096888 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/omniidl/main.py omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/main.py
+--- omniORB-4.2.0/src/tool/omniidl/python/omniidl/main.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/main.py 2014-05-08 22:38:02.989096999 +0200
+@@ -21,8 +21,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/omniidl/output.py omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/output.py
+--- omniORB-4.2.0/src/tool/omniidl/python/omniidl/output.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python/omniidl/output.py 2014-05-08 22:38:02.986096933 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/omniidl_be/ami.py omniORB-4.2.0-new/src/tool/omniidl/python/omniidl_be/ami.py
+--- omniORB-4.2.0/src/tool/omniidl/python/omniidl_be/ami.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python/omniidl_be/ami.py 2014-05-08 22:38:02.973096643 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/omniidl_be/dump.py omniORB-4.2.0-new/src/tool/omniidl/python/omniidl_be/dump.py
+--- omniORB-4.2.0/src/tool/omniidl/python/omniidl_be/dump.py 2011-02-09 15:36:20.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python/omniidl_be/dump.py 2014-05-08 22:38:02.977096732 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/omniidl_be/example.py omniORB-4.2.0-new/src/tool/omniidl/python/omniidl_be/example.py
+--- omniORB-4.2.0/src/tool/omniidl/python/omniidl_be/example.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python/omniidl_be/example.py 2014-05-08 22:38:02.974096665 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/omniidl_be/interactive.py omniORB-4.2.0-new/src/tool/omniidl/python/omniidl_be/interactive.py
+--- omniORB-4.2.0/src/tool/omniidl/python/omniidl_be/interactive.py 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python/omniidl_be/interactive.py 2014-05-08 22:38:02.974096665 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/scripts/omniidl.in omniORB-4.2.0-new/src/tool/omniidl/python/scripts/omniidl.in
+--- omniORB-4.2.0/src/tool/omniidl/python/scripts/omniidl.in 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python/scripts/omniidl.in 2014-05-08 22:38:02.991097044 +0200
+@@ -21,8 +21,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python/scripts/omniidlrun.py omniORB-4.2.0-new/src/tool/omniidl/python/scripts/omniidlrun.py
+--- omniORB-4.2.0/src/tool/omniidl/python/scripts/omniidlrun.py 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python/scripts/omniidlrun.py 2014-05-08 22:38:02.990097021 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/omniidl/idlast.py omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/idlast.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/omniidl/idlast.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/idlast.py 2014-05-08 22:38:03.005097356 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/omniidl/idltype.py omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/idltype.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/omniidl/idltype.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/idltype.py 2014-05-08 22:38:03.001097267 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/omniidl/idlutil.py omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/idlutil.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/omniidl/idlutil.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/idlutil.py 2014-05-08 22:38:03.007097401 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/omniidl/idlvisitor.py omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/idlvisitor.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/omniidl/idlvisitor.py 2013-07-18 13:28:03.000000000 +0200
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/idlvisitor.py 2014-05-08 22:38:03.005097356 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/omniidl/main.py omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/main.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/omniidl/main.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/main.py 2014-05-08 22:38:03.009097445 +0200
+@@ -21,8 +21,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/omniidl/output.py omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/output.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/omniidl/output.py 2011-02-17 13:47:31.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl/output.py 2014-05-08 22:38:03.006097378 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/omniidl_be/ami.py omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl_be/ami.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/omniidl_be/ami.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl_be/ami.py 2014-05-08 22:38:02.994097111 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/omniidl_be/dump.py omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl_be/dump.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/omniidl_be/dump.py 2011-02-09 15:36:20.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl_be/dump.py 2014-05-08 22:38:02.998097200 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/omniidl_be/example.py omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl_be/example.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/omniidl_be/example.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl_be/example.py 2014-05-08 22:38:02.994097111 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/omniidl_be/interactive.py omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl_be/interactive.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/omniidl_be/interactive.py 2003-03-23 22:04:39.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/omniidl_be/interactive.py 2014-05-08 22:38:02.995097133 +0200
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/scripts/omniidl.in omniORB-4.2.0-new/src/tool/omniidl/python3/scripts/omniidl.in
+--- omniORB-4.2.0/src/tool/omniidl/python3/scripts/omniidl.in 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/scripts/omniidl.in 2014-05-08 22:38:03.011097489 +0200
+@@ -21,8 +21,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff -rupN omniORB-4.2.0/src/tool/omniidl/python3/scripts/omniidlrun.py omniORB-4.2.0-new/src/tool/omniidl/python3/scripts/omniidlrun.py
+--- omniORB-4.2.0/src/tool/omniidl/python3/scripts/omniidlrun.py 2014-03-25 16:22:12.000000000 +0100
++++ omniORB-4.2.0-new/src/tool/omniidl/python3/scripts/omniidlrun.py 2014-05-08 22:38:03.010097466 +0200
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
diff --git a/omniORB.spec b/omniORB.spec
index af07c37..89ea42c 100644
--- a/omniORB.spec
+++ b/omniORB.spec
@@ -12,7 +12,7 @@
%bcond_without openssl
Name: omniORB
-Version: 4.1.7
+Version: 4.2.0
Release: 1%{?dist}
Summary: A robust high performance CORBA ORB for C++ and Python
@@ -25,11 +25,16 @@ Source2: omniORB-nameserver.logrotate
Source3: omniORB.cfg
Source4: omniNames.service
# fix incorrect fsf address
-Patch0: %{name}-4.1.6-fsf-address.patch
+Patch0: omniORB-4.2.0-fsf-address.patch
+# fix -Werror=format-security issue
+Patch1: omniORB-4.2.0-format-security.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
+BuildRequires: byacc
%{!?_without_openssl:BuildRequires: openssl-devel}
%if 0%{?with_systemd}
+BuildRequires: systemd
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
@@ -40,8 +45,6 @@ Requires(pre): shadow-utils
# This is for /sbin/service
Requires(postun): initscripts
%endif
-# needed for patch0
-BuildRequires: byacc
# we don't want to provide private python extension libs
%{?filter_setup:
@@ -97,6 +100,7 @@ developing applications that use %{name}.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%configure --disable-static %{?with_openssl:--with-openssl=%{_prefix}}
@@ -121,8 +125,8 @@ chmod 0755 %{buildroot}%{python_sitelib}/omniidl_be/cxx/{,skel,impl,dynskel,head
chmod +x %{buildroot}%{python_sitelib}/omniidl/main.py
%if 0%{?with_systemd}
# install systemd unit
-mkdir -p %{buildroot}/lib/systemd/system/
-install -m 0644 %{SOURCE4} %{buildroot}/lib/systemd/system/
+mkdir -p %{buildroot}%{_unitdir}
+install -m 0644 %{SOURCE4} %{buildroot}%{_unitdir}
%else
# install service init script
mkdir -p %{buildroot}%{_initddir}
@@ -188,17 +192,17 @@ fi
%files
%defattr(-,root,root,-)
-%doc COPYING.LIB README.FIRST.txt README.unix
+%doc COPYING.LIB README.FIRST.txt README.unix.txt
%{_libdir}/*.so.*
%files servers
%defattr(-,root,root,-)
-%if 0%{?fedora} < 15
+%if 0%{?with_systemd}
+%{_unitdir}/omniNames.service
+%else
%{_initddir}/%{nameserver}
%dir %attr(0755, %{name}, root) %{_sharedstatedir}/%{name}
%dir %attr(0755, %{name}, root) %{_localstatedir}/run/%{name}
-%else
-/lib/systemd/system/omniNames.service
%endif
%config(noreplace) %{_sysconfdir}/%{name}.cfg
%config(noreplace) %{_sysconfdir}/logrotate.d/%{nameserver}
@@ -243,6 +247,9 @@ fi
%changelog
+* Thu May 08 2014 Sandro Mani <manisandro at gmail.com> - 4.2.0-1
+- upstream 4.2.0
+
* Tue Sep 10 2013 Haïkel Guémar <hguemar at fedoraproject.org> - 4.1.7-1
- upstream 4.1.7 (RHBZ #1005607)
- macroized systemd scriptlets (RHBZ #850239)
diff --git a/sources b/sources
index 1965187..fa74741 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce8cbe25418a76a2aac5395399463362 omniORB-4.1.7.tar.bz2
+f1e104d0a2df92829c1b37a853f4805d omniORB-4.2.0.tar.bz2
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/omniORB.git/commit/?h=epel7&id=a4bc3b5665bcf17018bad911995dd14a0a7eb959
More information about the scm-commits
mailing list