fixed failed merge with autogen.sh

20 files changed, 20 insertions, 20 deletions

diff --git a/perf/c/local_lat.c b/perf/c/local_lat.c
index ca0ff9d..c53a684 100644
--- a/perf/c/local_lat.c
+++ b/perf/c/local_lat.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2009 FastMQ Inc.
+    Copyright (c) 2007-2010 iMatix Corporation
 
     This file is part of 0MQ.
 
diff --git a/perf/c/local_thr.c b/perf/c/local_thr.c
index f785e80..94a011d 100644
--- a/perf/c/local_thr.c
+++ b/perf/c/local_thr.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2009 FastMQ Inc.
+    Copyright (c) 2007-2010 iMatix Corporation
 
     This file is part of 0MQ.
 
diff --git a/perf/c/remote_lat.c b/perf/c/remote_lat.c
index 55c25b6..0c0a9f1 100644
--- a/perf/c/remote_lat.c
+++ b/perf/c/remote_lat.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2009 FastMQ Inc.
+    Copyright (c) 2007-2010 iMatix Corporation
 
     This file is part of 0MQ.
 
diff --git a/perf/c/remote_thr.c b/perf/c/remote_thr.c
index e6cc661..ab4f060 100644
--- a/perf/c/remote_thr.c
+++ b/perf/c/remote_thr.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2009 FastMQ Inc.
+    Copyright (c) 2007-2010 iMatix Corporation
 
     This file is part of 0MQ.
 
diff --git a/perf/cpp/local_lat.cpp b/perf/cpp/local_lat.cpp
index d8fee2e..6b7cb1a 100644
--- a/perf/cpp/local_lat.cpp
+++ b/perf/cpp/local_lat.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2009 FastMQ Inc.
+    Copyright (c) 2007-2010 iMatix Corporation
 
     This file is part of 0MQ.
 
diff --git a/perf/cpp/local_thr.cpp b/perf/cpp/local_thr.cpp
index cbcc106..b5839be 100644
--- a/perf/cpp/local_thr.cpp
+++ b/perf/cpp/local_thr.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2009 FastMQ Inc.
+    Copyright (c) 2007-2010 iMatix Corporation
 
     This file is part of 0MQ.
 
diff --git a/perf/cpp/remote_lat.cpp b/perf/cpp/remote_lat.cpp
index f6ccbb4..0d75c82 100644
--- a/perf/cpp/remote_lat.cpp
+++ b/perf/cpp/remote_lat.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2009 FastMQ Inc.
+    Copyright (c) 2007-2010 iMatix Corporation
 
     This file is part of 0MQ.
 
diff --git a/perf/cpp/remote_thr.cpp b/perf/cpp/remote_thr.cpp
index 3eee16c..4985416 100644
--- a/perf/cpp/remote_thr.cpp
+++ b/perf/cpp/remote_thr.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2009 FastMQ Inc.
+    Copyright (c) 2007-2010 iMatix Corporation
 
     This file is part of 0MQ.
 
diff --git a/perf/java/local_lat.java b/perf/java/local_lat.java
index 873f636..d886d4f 100644
--- a/perf/java/local_lat.java
+++ b/perf/java/local_lat.java
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2009 FastMQ Inc.
+    Copyright (c) 2007-2010 iMatix Corporation
 
     This file is part of 0MQ.
 
diff --git a/perf/java/local_thr.java b/perf/java/local_thr.java
index 2881a08..171b169 100644
--- a/perf/java/local_thr.java
+++ b/perf/java/local_thr.java
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2009 FastMQ Inc.
+    Copyright (c) 2007-2010 iMatix Corporation
 
     This file is part of 0MQ.
 
diff --git a/perf/java/remote_lat.java b/perf/java/remote_lat.java
index 905b82c..1db0520 100644
--- a/perf/java/remote_lat.java
+++ b/perf/java/remote_lat.java
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2009 FastMQ Inc.
+    Copyright (c) 2007-2010 iMatix Corporation
 
     This file is part of 0MQ.
 
diff --git a/perf/java/remote_thr.java b/perf/java/remote_thr.java
index f696fc3..f1b5124 100644
--- a/perf/java/remote_thr.java
+++ b/perf/java/remote_thr.java
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2009 FastMQ Inc.
+    Copyright (c) 2007-2010 iMatix Corporation
 
     This file is part of 0MQ.
 
diff --git a/perf/python/local_lat.py b/perf/python/local_lat.py
index e9d46e0..bc1d804 100644
--- a/perf/python/local_lat.py
+++ b/perf/python/local_lat.py
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2007-2009 FastMQ Inc.
+#    Copyright (c) 2007-2010 iMatix Corporation
 #
 #    This file is part of 0MQ.
 #
diff --git a/perf/python/local_thr.py b/perf/python/local_thr.py
index 26896d0..395376c 100644
--- a/perf/python/local_thr.py
+++ b/perf/python/local_thr.py
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2007-2009 FastMQ Inc.
+#    Copyright (c) 2007-2010 iMatix Corporation
 #
 #    This file is part of 0MQ.
 #
diff --git a/perf/python/remote_lat.py b/perf/python/remote_lat.py
index 29bd550..52ab061 100644
--- a/perf/python/remote_lat.py
+++ b/perf/python/remote_lat.py
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2007-2009 FastMQ Inc.
+#    Copyright (c) 2007-2010 iMatix Corporation
 #
 #    This file is part of 0MQ.
 #
diff --git a/perf/python/remote_thr.py b/perf/python/remote_thr.py
index f7c69cf..5fb8a2b 100644
--- a/perf/python/remote_thr.py
+++ b/perf/python/remote_thr.py
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2007-2009 FastMQ Inc.
+#    Copyright (c) 2007-2010 iMatix Corporation
 #
 #    This file is part of 0MQ.
 #
diff --git a/perf/ruby/local_lat.rb b/perf/ruby/local_lat.rb
index 8806ccb..a299630 100644
--- a/perf/ruby/local_lat.rb
+++ b/perf/ruby/local_lat.rb
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2007-2009 FastMQ Inc.
+#    Copyright (c) 2007-2010 iMatix Corporation
 #
 #    This file is part of 0MQ.
 #
diff --git a/perf/ruby/local_thr.rb b/perf/ruby/local_thr.rb
index 6d9d13f..58447b4 100644
--- a/perf/ruby/local_thr.rb
+++ b/perf/ruby/local_thr.rb
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2007-2009 FastMQ Inc.
+#    Copyright (c) 2007-2010 iMatix Corporation
 #
 #    This file is part of 0MQ.
 #
diff --git a/perf/ruby/remote_lat.rb b/perf/ruby/remote_lat.rb
index f5b438d..7449aff 100644
--- a/perf/ruby/remote_lat.rb
+++ b/perf/ruby/remote_lat.rb
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2007-2009 FastMQ Inc.
+#    Copyright (c) 2007-2010 iMatix Corporation
 #
 #    This file is part of 0MQ.
 #
diff --git a/perf/ruby/remote_thr.rb b/perf/ruby/remote_thr.rb
index 760ff88..9edd1c6 100644
--- a/perf/ruby/remote_thr.rb
+++ b/perf/ruby/remote_thr.rb
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2007-2009 FastMQ Inc.
+#    Copyright (c) 2007-2010 iMatix Corporation
 #
 #    This file is part of 0MQ.
 #