http://bugzilla/bugzilla/show_bug.cgi?id=2819

163 files changed, 4 insertions, 59 deletions

diff --git a/py/CHANGES b/py/CHANGES
index 8cf148ff5c7..1e5c7d4a8c8 100644
--- a/py/CHANGES
+++ b/py/CHANGES
@@ -1,6 +1,8 @@
 Changes since version 3.2.X (binary incompatible)
 -------------------------------------------------
 
+- Removed "#!/usr/bin/env python" where unnecessary.
+
 - Added ice_staticId() method to generated Slice classes.
 
 - The use of sequences (and structs containing sequences) as valid 
diff --git a/py/demo/Glacier2/callback/Client.py b/py/demo/Glacier2/callback/Client.py
index fc5b602969a..fc5b602969a 100644..100755
--- a/py/demo/Glacier2/callback/Client.py
+++ b/py/demo/Glacier2/callback/Client.py
diff --git a/py/demo/Glacier2/callback/Server.py b/py/demo/Glacier2/callback/Server.py
index 14f2241196f..14f2241196f 100644..100755
--- a/py/demo/Glacier2/callback/Server.py
+++ b/py/demo/Glacier2/callback/Server.py
diff --git a/py/demo/Glacier2/callback/SessionServer.py b/py/demo/Glacier2/callback/SessionServer.py
index f4e79c5ebe2..f4e79c5ebe2 100644..100755
--- a/py/demo/Glacier2/callback/SessionServer.py
+++ b/py/demo/Glacier2/callback/SessionServer.py
diff --git a/py/demo/Ice/async/Client.py b/py/demo/Ice/async/Client.py
index 33550214814..33550214814 100644..100755
--- a/py/demo/Ice/async/Client.py
+++ b/py/demo/Ice/async/Client.py
diff --git a/py/demo/Ice/bidir/Client.py b/py/demo/Ice/bidir/Client.py
index d5c1f3aa7a6..d5c1f3aa7a6 100644..100755
--- a/py/demo/Ice/bidir/Client.py
+++ b/py/demo/Ice/bidir/Client.py
diff --git a/py/demo/Ice/bidir/Server.py b/py/demo/Ice/bidir/Server.py
index 9b5c3db5ffe..9b5c3db5ffe 100644..100755
--- a/py/demo/Ice/bidir/Server.py
+++ b/py/demo/Ice/bidir/Server.py
diff --git a/py/demo/Ice/callback/Client.py b/py/demo/Ice/callback/Client.py
index ec81b51ce5f..ec81b51ce5f 100644..100755
--- a/py/demo/Ice/callback/Client.py
+++ b/py/demo/Ice/callback/Client.py
diff --git a/py/demo/Ice/callback/Server.py b/py/demo/Ice/callback/Server.py
index 62c06708ded..62c06708ded 100644..100755
--- a/py/demo/Ice/callback/Server.py
+++ b/py/demo/Ice/callback/Server.py
diff --git a/py/demo/Ice/hello/Client.py b/py/demo/Ice/hello/Client.py
index d7c60aecc24..d7c60aecc24 100644..100755
--- a/py/demo/Ice/hello/Client.py
+++ b/py/demo/Ice/hello/Client.py
diff --git a/py/demo/Ice/hello/Server.py b/py/demo/Ice/hello/Server.py
index 47e7a070736..47e7a070736 100644..100755
--- a/py/demo/Ice/hello/Server.py
+++ b/py/demo/Ice/hello/Server.py
diff --git a/py/demo/Ice/latency/Client.py b/py/demo/Ice/latency/Client.py
index 070ae035460..070ae035460 100644..100755
--- a/py/demo/Ice/latency/Client.py
+++ b/py/demo/Ice/latency/Client.py
diff --git a/py/demo/Ice/latency/Server.py b/py/demo/Ice/latency/Server.py
index 7573dc6ab3a..7573dc6ab3a 100644..100755
--- a/py/demo/Ice/latency/Server.py
+++ b/py/demo/Ice/latency/Server.py
diff --git a/py/demo/Ice/minimal/Client.py b/py/demo/Ice/minimal/Client.py
index ed67bb276e6..ed67bb276e6 100644..100755
--- a/py/demo/Ice/minimal/Client.py
+++ b/py/demo/Ice/minimal/Client.py
diff --git a/py/demo/Ice/minimal/Server.py b/py/demo/Ice/minimal/Server.py
index d5aaea47dd7..d5aaea47dd7 100644..100755
--- a/py/demo/Ice/minimal/Server.py
+++ b/py/demo/Ice/minimal/Server.py
diff --git a/py/demo/Ice/session/Client.py b/py/demo/Ice/session/Client.py
index 102d5fcf9b3..102d5fcf9b3 100644..100755
--- a/py/demo/Ice/session/Client.py
+++ b/py/demo/Ice/session/Client.py
diff --git a/py/demo/Ice/session/Server.py b/py/demo/Ice/session/Server.py
index 3d0c916b86f..3d0c916b86f 100644..100755
--- a/py/demo/Ice/session/Server.py
+++ b/py/demo/Ice/session/Server.py
diff --git a/py/demo/Ice/throughput/Client.py b/py/demo/Ice/throughput/Client.py
index 9a557757b40..9a557757b40 100644..100755
--- a/py/demo/Ice/throughput/Client.py
+++ b/py/demo/Ice/throughput/Client.py
diff --git a/py/demo/Ice/throughput/Server.py b/py/demo/Ice/throughput/Server.py
index 8986a632358..8986a632358 100644..100755
--- a/py/demo/Ice/throughput/Server.py
+++ b/py/demo/Ice/throughput/Server.py
diff --git a/py/demo/Ice/value/Client.py b/py/demo/Ice/value/Client.py
index 94ac920ac85..94ac920ac85 100644..100755
--- a/py/demo/Ice/value/Client.py
+++ b/py/demo/Ice/value/Client.py
diff --git a/py/demo/Ice/value/Printer.py b/py/demo/Ice/value/Printer.py
index 68c6c2c647a..68c6c2c647a 100644..100755
--- a/py/demo/Ice/value/Printer.py
+++ b/py/demo/Ice/value/Printer.py
diff --git a/py/demo/Ice/value/Server.py b/py/demo/Ice/value/Server.py
index cd4e4e160bd..cd4e4e160bd 100644..100755
--- a/py/demo/Ice/value/Server.py
+++ b/py/demo/Ice/value/Server.py
diff --git a/py/demo/IceGrid/simple/Client.py b/py/demo/IceGrid/simple/Client.py
index a85d79fb303..a85d79fb303 100644..100755
--- a/py/demo/IceGrid/simple/Client.py
+++ b/py/demo/IceGrid/simple/Client.py
diff --git a/py/demo/IceGrid/simple/Server.py b/py/demo/IceGrid/simple/Server.py
index 55f93a09378..55f93a09378 100644..100755
--- a/py/demo/IceGrid/simple/Server.py
+++ b/py/demo/IceGrid/simple/Server.py
diff --git a/py/demo/IceStorm/clock/Publisher.py b/py/demo/IceStorm/clock/Publisher.py
index 131476c52e2..131476c52e2 100644..100755
--- a/py/demo/IceStorm/clock/Publisher.py
+++ b/py/demo/IceStorm/clock/Publisher.py
diff --git a/py/demo/IceStorm/clock/Subscriber.py b/py/demo/IceStorm/clock/Subscriber.py
index 3a9d283ade4..3a9d283ade4 100644..100755
--- a/py/demo/IceStorm/clock/Subscriber.py
+++ b/py/demo/IceStorm/clock/Subscriber.py
diff --git a/py/demo/book/printer/Client.py b/py/demo/book/printer/Client.py
index f7eb87d372b..f7eb87d372b 100644..100755
--- a/py/demo/book/printer/Client.py
+++ b/py/demo/book/printer/Client.py
diff --git a/py/demo/book/printer/Server.py b/py/demo/book/printer/Server.py
index 6106adfa732..6106adfa732 100644..100755
--- a/py/demo/book/printer/Server.py
+++ b/py/demo/book/printer/Server.py
diff --git a/py/demo/book/simple_filesystem/Client.py b/py/demo/book/simple_filesystem/Client.py
index e43544e2c69..e43544e2c69 100644..100755
--- a/py/demo/book/simple_filesystem/Client.py
+++ b/py/demo/book/simple_filesystem/Client.py
diff --git a/py/demo/book/simple_filesystem/Server.py b/py/demo/book/simple_filesystem/Server.py
index cf411d40b77..cf411d40b77 100644..100755
--- a/py/demo/book/simple_filesystem/Server.py
+++ b/py/demo/book/simple_filesystem/Server.py
diff --git a/py/python/Ice.py b/py/python/Ice.py
index 9826b82f7eb..9c7924bbee3 100644
--- a/py/python/Ice.py
+++ b/py/python/Ice.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/adapterDeactivation/AllTests.py b/py/test/Ice/adapterDeactivation/AllTests.py
index 16e90f5a1c3..af5446614c2 100644
--- a/py/test/Ice/adapterDeactivation/AllTests.py
+++ b/py/test/Ice/adapterDeactivation/AllTests.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/adapterDeactivation/Client.py b/py/test/Ice/adapterDeactivation/Client.py
index 30027f180b2..30027f180b2 100644..100755
--- a/py/test/Ice/adapterDeactivation/Client.py
+++ b/py/test/Ice/adapterDeactivation/Client.py
diff --git a/py/test/Ice/adapterDeactivation/Collocated.py b/py/test/Ice/adapterDeactivation/Collocated.py
index d9d33612bff..d9d33612bff 100644..100755
--- a/py/test/Ice/adapterDeactivation/Collocated.py
+++ b/py/test/Ice/adapterDeactivation/Collocated.py
diff --git a/py/test/Ice/adapterDeactivation/Server.py b/py/test/Ice/adapterDeactivation/Server.py
index 20c663efaa3..fba85833131 100644
--- a/py/test/Ice/adapterDeactivation/Server.py
+++ b/py/test/Ice/adapterDeactivation/Server.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/adapterDeactivation/TestI.py b/py/test/Ice/adapterDeactivation/TestI.py
index 608edea035d..11979d0661b 100644
--- a/py/test/Ice/adapterDeactivation/TestI.py
+++ b/py/test/Ice/adapterDeactivation/TestI.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/application/Client.py b/py/test/Ice/application/Client.py
index 6dcef0664bc..6dcef0664bc 100644..100755
--- a/py/test/Ice/application/Client.py
+++ b/py/test/Ice/application/Client.py
diff --git a/py/test/Ice/binding/AllTests.py b/py/test/Ice/binding/AllTests.py
index a66c718301f..fb55a3127c9 100644
--- a/py/test/Ice/binding/AllTests.py
+++ b/py/test/Ice/binding/AllTests.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/binding/Client.py b/py/test/Ice/binding/Client.py
index ceb94b83a78..ceb94b83a78 100644..100755
--- a/py/test/Ice/binding/Client.py
+++ b/py/test/Ice/binding/Client.py
diff --git a/py/test/Ice/binding/Server.py b/py/test/Ice/binding/Server.py
index 39b5e5d211c..39b5e5d211c 100644..100755
--- a/py/test/Ice/binding/Server.py
+++ b/py/test/Ice/binding/Server.py
diff --git a/py/test/Ice/binding/TestI.py b/py/test/Ice/binding/TestI.py
index 8b0598a671e..e08afd40714 100644
--- a/py/test/Ice/binding/TestI.py
+++ b/py/test/Ice/binding/TestI.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/blobject/Client.py b/py/test/Ice/blobject/Client.py
index b402d0e8145..b402d0e8145 100644..100755
--- a/py/test/Ice/blobject/Client.py
+++ b/py/test/Ice/blobject/Client.py
diff --git a/py/test/Ice/blobject/RouterI.py b/py/test/Ice/blobject/RouterI.py
index 30259e99c7e..018dfd4b1c3 100644
--- a/py/test/Ice/blobject/RouterI.py
+++ b/py/test/Ice/blobject/RouterI.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/blobject/Server.py b/py/test/Ice/blobject/Server.py
index af986ad5dd3..af986ad5dd3 100644..100755
--- a/py/test/Ice/blobject/Server.py
+++ b/py/test/Ice/blobject/Server.py
diff --git a/py/test/Ice/checksum/AllTests.py b/py/test/Ice/checksum/AllTests.py
index 6747af28eb8..72de71616e9 100644
--- a/py/test/Ice/checksum/AllTests.py
+++ b/py/test/Ice/checksum/AllTests.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/checksum/Client.py b/py/test/Ice/checksum/Client.py
index 446b41fe545..446b41fe545 100644..100755
--- a/py/test/Ice/checksum/Client.py
+++ b/py/test/Ice/checksum/Client.py
diff --git a/py/test/Ice/checksum/Server.py b/py/test/Ice/checksum/Server.py
index c2f72db5dfd..c2f72db5dfd 100644..100755
--- a/py/test/Ice/checksum/Server.py
+++ b/py/test/Ice/checksum/Server.py
diff --git a/py/test/Ice/custom/AllTests.py b/py/test/Ice/custom/AllTests.py
index 39016a2dddf..6cf5eba9184 100644
--- a/py/test/Ice/custom/AllTests.py
+++ b/py/test/Ice/custom/AllTests.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/custom/Client.py b/py/test/Ice/custom/Client.py
index b2b2e281a4f..b2b2e281a4f 100644..100755
--- a/py/test/Ice/custom/Client.py
+++ b/py/test/Ice/custom/Client.py
diff --git a/py/test/Ice/custom/Server.py b/py/test/Ice/custom/Server.py
index 8a2f638971e..8a2f638971e 100644..100755
--- a/py/test/Ice/custom/Server.py
+++ b/py/test/Ice/custom/Server.py
diff --git a/py/test/Ice/exceptions/AllTests.py b/py/test/Ice/exceptions/AllTests.py
index 925d412d2d8..535771b3481 100644
--- a/py/test/Ice/exceptions/AllTests.py
+++ b/py/test/Ice/exceptions/AllTests.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/exceptions/Client.py b/py/test/Ice/exceptions/Client.py
index af419d19e1d..af419d19e1d 100644..100755
--- a/py/test/Ice/exceptions/Client.py
+++ b/py/test/Ice/exceptions/Client.py
diff --git a/py/test/Ice/exceptions/Collocated.py b/py/test/Ice/exceptions/Collocated.py
index 50aab50055f..50aab50055f 100644..100755
--- a/py/test/Ice/exceptions/Collocated.py
+++ b/py/test/Ice/exceptions/Collocated.py
diff --git a/py/test/Ice/exceptions/Server.py b/py/test/Ice/exceptions/Server.py
index f89adc3b362..f89adc3b362 100644..100755
--- a/py/test/Ice/exceptions/Server.py
+++ b/py/test/Ice/exceptions/Server.py
diff --git a/py/test/Ice/exceptions/ServerAMD.py b/py/test/Ice/exceptions/ServerAMD.py
index 38580006f7a..38580006f7a 100644..100755
--- a/py/test/Ice/exceptions/ServerAMD.py
+++ b/py/test/Ice/exceptions/ServerAMD.py
diff --git a/py/test/Ice/exceptions/TestI.py b/py/test/Ice/exceptions/TestI.py
index d21acb44118..bd064a9222a 100644
--- a/py/test/Ice/exceptions/TestI.py
+++ b/py/test/Ice/exceptions/TestI.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/facets/AllTests.py b/py/test/Ice/facets/AllTests.py
index 528505d8a6e..7de4af6358d 100644
--- a/py/test/Ice/facets/AllTests.py
+++ b/py/test/Ice/facets/AllTests.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/facets/Client.py b/py/test/Ice/facets/Client.py
index 91623582c73..91623582c73 100644..100755
--- a/py/test/Ice/facets/Client.py
+++ b/py/test/Ice/facets/Client.py
diff --git a/py/test/Ice/facets/Collocated.py b/py/test/Ice/facets/Collocated.py
index ca9e6dc665c..ca9e6dc665c 100644..100755
--- a/py/test/Ice/facets/Collocated.py
+++ b/py/test/Ice/facets/Collocated.py
diff --git a/py/test/Ice/facets/Server.py b/py/test/Ice/facets/Server.py
index dbe3b98c7f5..dbe3b98c7f5 100644..100755
--- a/py/test/Ice/facets/Server.py
+++ b/py/test/Ice/facets/Server.py
diff --git a/py/test/Ice/facets/TestI.py b/py/test/Ice/facets/TestI.py
index 034c70d7f7d..8f3db9e2a1e 100644
--- a/py/test/Ice/facets/TestI.py
+++ b/py/test/Ice/facets/TestI.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/faultTolerance/AllTests.py b/py/test/Ice/faultTolerance/AllTests.py
index a44e4a1f9c3..57defa3e6c2 100644
--- a/py/test/Ice/faultTolerance/AllTests.py
+++ b/py/test/Ice/faultTolerance/AllTests.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/faultTolerance/Client.py b/py/test/Ice/faultTolerance/Client.py
index a0640c58c20..a0640c58c20 100644..100755
--- a/py/test/Ice/faultTolerance/Client.py
+++ b/py/test/Ice/faultTolerance/Client.py
diff --git a/py/test/Ice/faultTolerance/Server.py b/py/test/Ice/faultTolerance/Server.py
index e753c4fbb6a..e753c4fbb6a 100644..100755
--- a/py/test/Ice/faultTolerance/Server.py
+++ b/py/test/Ice/faultTolerance/Server.py
diff --git a/py/test/Ice/inheritance/AllTests.py b/py/test/Ice/inheritance/AllTests.py
index e82772405af..0f31d177869 100644
--- a/py/test/Ice/inheritance/AllTests.py
+++ b/py/test/Ice/inheritance/AllTests.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/inheritance/Client.py b/py/test/Ice/inheritance/Client.py
index 1c68ab740a9..1c68ab740a9 100644..100755
--- a/py/test/Ice/inheritance/Client.py
+++ b/py/test/Ice/inheritance/Client.py
diff --git a/py/test/Ice/inheritance/Collocated.py b/py/test/Ice/inheritance/Collocated.py
index 202292cf7bc..202292cf7bc 100644..100755
--- a/py/test/Ice/inheritance/Collocated.py
+++ b/py/test/Ice/inheritance/Collocated.py
diff --git a/py/test/Ice/inheritance/Server.py b/py/test/Ice/inheritance/Server.py
index 0ea27904b8c..0ea27904b8c 100644..100755
--- a/py/test/Ice/inheritance/Server.py
+++ b/py/test/Ice/inheritance/Server.py
diff --git a/py/test/Ice/inheritance/TestI.py b/py/test/Ice/inheritance/TestI.py
index b85e5393a41..f0472fdc1ed 100644
--- a/py/test/Ice/inheritance/TestI.py
+++ b/py/test/Ice/inheritance/TestI.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/location/AllTests.py b/py/test/Ice/location/AllTests.py
index be26f7b16f8..37de5f96f37 100644
--- a/py/test/Ice/location/AllTests.py
+++ b/py/test/Ice/location/AllTests.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/location/Client.py b/py/test/Ice/location/Client.py
index 6c673ae57c5..6c673ae57c5 100644..100755
--- a/py/test/Ice/location/Client.py
+++ b/py/test/Ice/location/Client.py
diff --git a/py/test/Ice/location/Server.py b/py/test/Ice/location/Server.py
index 4f7c5870c5b..4f7c5870c5b 100644..100755
--- a/py/test/Ice/location/Server.py
+++ b/py/test/Ice/location/Server.py
diff --git a/py/test/Ice/objects/AllTests.py b/py/test/Ice/objects/AllTests.py
index 1dbc753257a..ff524c3ea73 100644
--- a/py/test/Ice/objects/AllTests.py
+++ b/py/test/Ice/objects/AllTests.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/objects/Client.py b/py/test/Ice/objects/Client.py
index 073a47e6c54..073a47e6c54 100644..100755
--- a/py/test/Ice/objects/Client.py
+++ b/py/test/Ice/objects/Client.py
diff --git a/py/test/Ice/objects/Collocated.py b/py/test/Ice/objects/Collocated.py
index 9db84e6d90c..9db84e6d90c 100644..100755
--- a/py/test/Ice/objects/Collocated.py
+++ b/py/test/Ice/objects/Collocated.py
diff --git a/py/test/Ice/objects/Server.py b/py/test/Ice/objects/Server.py
index 7aee9423d4a..7aee9423d4a 100644..100755
--- a/py/test/Ice/objects/Server.py
+++ b/py/test/Ice/objects/Server.py
diff --git a/py/test/Ice/objects/TestI.py b/py/test/Ice/objects/TestI.py
index 8faa66d46b1..26e783e1ebb 100644
--- a/py/test/Ice/objects/TestI.py
+++ b/py/test/Ice/objects/TestI.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/operations/AllTests.py b/py/test/Ice/operations/AllTests.py
index 9d32119b2d4..5484f648511 100644
--- a/py/test/Ice/operations/AllTests.py
+++ b/py/test/Ice/operations/AllTests.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/operations/BatchOneways.py b/py/test/Ice/operations/BatchOneways.py
index d9029d60429..42465d165ac 100644
--- a/py/test/Ice/operations/BatchOneways.py
+++ b/py/test/Ice/operations/BatchOneways.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/operations/Client.py b/py/test/Ice/operations/Client.py
index 9a0c6494b99..9a0c6494b99 100644..100755
--- a/py/test/Ice/operations/Client.py
+++ b/py/test/Ice/operations/Client.py
diff --git a/py/test/Ice/operations/Collocated.py b/py/test/Ice/operations/Collocated.py
index cdd3503654e..cdd3503654e 100644..100755
--- a/py/test/Ice/operations/Collocated.py
+++ b/py/test/Ice/operations/Collocated.py
diff --git a/py/test/Ice/operations/Oneways.py b/py/test/Ice/operations/Oneways.py
index 31a0212ff06..beadb6f101e 100644
--- a/py/test/Ice/operations/Oneways.py
+++ b/py/test/Ice/operations/Oneways.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/operations/OnewaysAMI.py b/py/test/Ice/operations/OnewaysAMI.py
index a5667cd6aab..a2c84747039 100644
--- a/py/test/Ice/operations/OnewaysAMI.py
+++ b/py/test/Ice/operations/OnewaysAMI.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/operations/Server.py b/py/test/Ice/operations/Server.py
index f23901880c4..f23901880c4 100644..100755
--- a/py/test/Ice/operations/Server.py
+++ b/py/test/Ice/operations/Server.py
diff --git a/py/test/Ice/operations/ServerAMD.py b/py/test/Ice/operations/ServerAMD.py
index 5a1cf52631b..5a1cf52631b 100644..100755
--- a/py/test/Ice/operations/ServerAMD.py
+++ b/py/test/Ice/operations/ServerAMD.py
diff --git a/py/test/Ice/operations/TestI.py b/py/test/Ice/operations/TestI.py
index 8a6bc5cd87c..d98c441930b 100644
--- a/py/test/Ice/operations/TestI.py
+++ b/py/test/Ice/operations/TestI.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/operations/Twoways.py b/py/test/Ice/operations/Twoways.py
index dc36cccf8bc..6a19f2f6971 100644
--- a/py/test/Ice/operations/Twoways.py
+++ b/py/test/Ice/operations/Twoways.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/operations/TwowaysAMI.py b/py/test/Ice/operations/TwowaysAMI.py
index 022e48b6079..95c323ddc29 100644
--- a/py/test/Ice/operations/TwowaysAMI.py
+++ b/py/test/Ice/operations/TwowaysAMI.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/proxy/AllTests.py b/py/test/Ice/proxy/AllTests.py
index 64aa42b0b34..a23f3ce2569 100644
--- a/py/test/Ice/proxy/AllTests.py
+++ b/py/test/Ice/proxy/AllTests.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/proxy/Client.py b/py/test/Ice/proxy/Client.py
index 070df3ac032..070df3ac032 100644..100755
--- a/py/test/Ice/proxy/Client.py
+++ b/py/test/Ice/proxy/Client.py
diff --git a/py/test/Ice/proxy/Collocated.py b/py/test/Ice/proxy/Collocated.py
index cdd3503654e..cdd3503654e 100644..100755
--- a/py/test/Ice/proxy/Collocated.py
+++ b/py/test/Ice/proxy/Collocated.py
diff --git a/py/test/Ice/proxy/Server.py b/py/test/Ice/proxy/Server.py
index 67d8a99ebc1..67d8a99ebc1 100644..100755
--- a/py/test/Ice/proxy/Server.py
+++ b/py/test/Ice/proxy/Server.py
diff --git a/py/test/Ice/proxy/ServerAMD.py b/py/test/Ice/proxy/ServerAMD.py
index 0f7bc95d964..0f7bc95d964 100644..100755
--- a/py/test/Ice/proxy/ServerAMD.py
+++ b/py/test/Ice/proxy/ServerAMD.py
diff --git a/py/test/Ice/proxy/TestI.py b/py/test/Ice/proxy/TestI.py
index 196ed7ef150..1aaa2f3f327 100644
--- a/py/test/Ice/proxy/TestI.py
+++ b/py/test/Ice/proxy/TestI.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/retry/AllTests.py b/py/test/Ice/retry/AllTests.py
index 3c2ff0cb9f0..50b53846887 100644
--- a/py/test/Ice/retry/AllTests.py
+++ b/py/test/Ice/retry/AllTests.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/retry/Client.py b/py/test/Ice/retry/Client.py
index c951e0e95e1..c951e0e95e1 100644..100755
--- a/py/test/Ice/retry/Client.py
+++ b/py/test/Ice/retry/Client.py
diff --git a/py/test/Ice/retry/Server.py b/py/test/Ice/retry/Server.py
index 421936558a6..421936558a6 100644..100755
--- a/py/test/Ice/retry/Server.py
+++ b/py/test/Ice/retry/Server.py
diff --git a/py/test/Ice/retry/TestI.py b/py/test/Ice/retry/TestI.py
index 0405ac76996..27ae297b07e 100644
--- a/py/test/Ice/retry/TestI.py
+++ b/py/test/Ice/retry/TestI.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/servantLocator/AllTests.py b/py/test/Ice/servantLocator/AllTests.py
index 74267dc7b13..afbbc65d7c2 100644
--- a/py/test/Ice/servantLocator/AllTests.py
+++ b/py/test/Ice/servantLocator/AllTests.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/servantLocator/Client.py b/py/test/Ice/servantLocator/Client.py
index d89bcd2360f..d89bcd2360f 100644..100755
--- a/py/test/Ice/servantLocator/Client.py
+++ b/py/test/Ice/servantLocator/Client.py
diff --git a/py/test/Ice/servantLocator/Collocated.py b/py/test/Ice/servantLocator/Collocated.py
index 1cd88fe9f5e..1cd88fe9f5e 100644..100755
--- a/py/test/Ice/servantLocator/Collocated.py
+++ b/py/test/Ice/servantLocator/Collocated.py
diff --git a/py/test/Ice/servantLocator/Server.py b/py/test/Ice/servantLocator/Server.py
index 08abc51e980..08abc51e980 100644..100755
--- a/py/test/Ice/servantLocator/Server.py
+++ b/py/test/Ice/servantLocator/Server.py
diff --git a/py/test/Ice/servantLocator/ServerAMD.py b/py/test/Ice/servantLocator/ServerAMD.py
index 92a3e9155bb..92a3e9155bb 100644..100755
--- a/py/test/Ice/servantLocator/ServerAMD.py
+++ b/py/test/Ice/servantLocator/ServerAMD.py
diff --git a/py/test/Ice/servantLocator/TestAMDI.py b/py/test/Ice/servantLocator/TestAMDI.py
index e2324c19fbd..bafa9782301 100644
--- a/py/test/Ice/servantLocator/TestAMDI.py
+++ b/py/test/Ice/servantLocator/TestAMDI.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/servantLocator/TestI.py b/py/test/Ice/servantLocator/TestI.py
index 559bc651d27..76fc4ad6f7f 100644
--- a/py/test/Ice/servantLocator/TestI.py
+++ b/py/test/Ice/servantLocator/TestI.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/slicing/exceptions/AllTests.py b/py/test/Ice/slicing/exceptions/AllTests.py
index 7db32ee1b08..7db32ee1b08 100644..100755
--- a/py/test/Ice/slicing/exceptions/AllTests.py
+++ b/py/test/Ice/slicing/exceptions/AllTests.py
diff --git a/py/test/Ice/slicing/exceptions/Client.py b/py/test/Ice/slicing/exceptions/Client.py
index 01c3a6979e7..01c3a6979e7 100644..100755
--- a/py/test/Ice/slicing/exceptions/Client.py
+++ b/py/test/Ice/slicing/exceptions/Client.py
diff --git a/py/test/Ice/slicing/exceptions/Server.py b/py/test/Ice/slicing/exceptions/Server.py
index 9e4e6ccc796..9e4e6ccc796 100644..100755
--- a/py/test/Ice/slicing/exceptions/Server.py
+++ b/py/test/Ice/slicing/exceptions/Server.py
diff --git a/py/test/Ice/slicing/exceptions/ServerAMD.py b/py/test/Ice/slicing/exceptions/ServerAMD.py
index e3ffecca749..e3ffecca749 100644..100755
--- a/py/test/Ice/slicing/exceptions/ServerAMD.py
+++ b/py/test/Ice/slicing/exceptions/ServerAMD.py
diff --git a/py/test/Ice/slicing/objects/AllTests.py b/py/test/Ice/slicing/objects/AllTests.py
index 5f251538b7f..5f251538b7f 100644..100755
--- a/py/test/Ice/slicing/objects/AllTests.py
+++ b/py/test/Ice/slicing/objects/AllTests.py
diff --git a/py/test/Ice/slicing/objects/Client.py b/py/test/Ice/slicing/objects/Client.py
index 01c3a6979e7..01c3a6979e7 100644..100755
--- a/py/test/Ice/slicing/objects/Client.py
+++ b/py/test/Ice/slicing/objects/Client.py
diff --git a/py/test/Ice/slicing/objects/Server.py b/py/test/Ice/slicing/objects/Server.py
index b7d6ee15d47..b7d6ee15d47 100644..100755
--- a/py/test/Ice/slicing/objects/Server.py
+++ b/py/test/Ice/slicing/objects/Server.py
diff --git a/py/test/Ice/slicing/objects/ServerAMD.py b/py/test/Ice/slicing/objects/ServerAMD.py
index 54860e7cd1c..54860e7cd1c 100644..100755
--- a/py/test/Ice/slicing/objects/ServerAMD.py
+++ b/py/test/Ice/slicing/objects/ServerAMD.py
diff --git a/py/test/Ice/timeout/AllTests.py b/py/test/Ice/timeout/AllTests.py
index 47ff5c5e577..25e86e96f4e 100644
--- a/py/test/Ice/timeout/AllTests.py
+++ b/py/test/Ice/timeout/AllTests.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/py/test/Ice/timeout/Client.py b/py/test/Ice/timeout/Client.py
index bdbb599c5dd..bdbb599c5dd 100644..100755
--- a/py/test/Ice/timeout/Client.py
+++ b/py/test/Ice/timeout/Client.py
diff --git a/py/test/Ice/timeout/Server.py b/py/test/Ice/timeout/Server.py
index 40058144efe..40058144efe 100644..100755
--- a/py/test/Ice/timeout/Server.py
+++ b/py/test/Ice/timeout/Server.py
diff --git a/py/test/Slice/keyword/Client.py b/py/test/Slice/keyword/Client.py
index aa8bdc11b46..aa8bdc11b46 100644..100755
--- a/py/test/Slice/keyword/Client.py
+++ b/py/test/Slice/keyword/Client.py
diff --git a/rb/CHANGES b/rb/CHANGES
index f9bd19d5572..7f59498e0d1 100644
--- a/rb/CHANGES
+++ b/rb/CHANGES
@@ -1,6 +1,8 @@
 Changes since version 3.2.X (binary incompatible)
 -------------------------------------------------
 
+- Removed "#!/usr/bin/env ruby" where unnecessary.
+
 - Added ice_staticId() method to generated Slice classes.
 
 - The use of sequences (and structs containing sequences) as valid 
diff --git a/rb/demo/Ice/hello/Client.rb b/rb/demo/Ice/hello/Client.rb
index 0cf6dea9db4..0cf6dea9db4 100644..100755
--- a/rb/demo/Ice/hello/Client.rb
+++ b/rb/demo/Ice/hello/Client.rb
diff --git a/rb/demo/Ice/latency/Client.rb b/rb/demo/Ice/latency/Client.rb
index ac2e69be9cd..ac2e69be9cd 100644..100755
--- a/rb/demo/Ice/latency/Client.rb
+++ b/rb/demo/Ice/latency/Client.rb
diff --git a/rb/demo/Ice/minimal/Client.rb b/rb/demo/Ice/minimal/Client.rb
index 27760c003ef..27760c003ef 100644..100755
--- a/rb/demo/Ice/minimal/Client.rb
+++ b/rb/demo/Ice/minimal/Client.rb
diff --git a/rb/demo/Ice/session/Client.rb b/rb/demo/Ice/session/Client.rb
index 0d46e60674b..0d46e60674b 100644..100755
--- a/rb/demo/Ice/session/Client.rb
+++ b/rb/demo/Ice/session/Client.rb
diff --git a/rb/demo/Ice/throughput/Client.rb b/rb/demo/Ice/throughput/Client.rb
index a7de5e0bb68..a7de5e0bb68 100644..100755
--- a/rb/demo/Ice/throughput/Client.rb
+++ b/rb/demo/Ice/throughput/Client.rb
diff --git a/rb/demo/Ice/value/Client.rb b/rb/demo/Ice/value/Client.rb
index 6984a965001..6984a965001 100644..100755
--- a/rb/demo/Ice/value/Client.rb
+++ b/rb/demo/Ice/value/Client.rb
diff --git a/rb/demo/book/printer/Client.rb b/rb/demo/book/printer/Client.rb
index 5ce91291e4c..5ce91291e4c 100644..100755
--- a/rb/demo/book/printer/Client.rb
+++ b/rb/demo/book/printer/Client.rb
diff --git a/rb/demo/book/simple_filesystem/Client.rb b/rb/demo/book/simple_filesystem/Client.rb
index 65d1671074b..65d1671074b 100644..100755
--- a/rb/demo/book/simple_filesystem/Client.rb
+++ b/rb/demo/book/simple_filesystem/Client.rb
diff --git a/rb/ruby/Glacier2.rb b/rb/ruby/Glacier2.rb
index 1b1a1af002b..a758372c78e 100644
--- a/rb/ruby/Glacier2.rb
+++ b/rb/ruby/Glacier2.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/ruby/Ice.rb b/rb/ruby/Ice.rb
index ad026642f98..b09e58dd8f6 100644
--- a/rb/ruby/Ice.rb
+++ b/rb/ruby/Ice.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/ruby/IceBox.rb b/rb/ruby/IceBox.rb
index f90c023aa23..b45f21e5901 100644
--- a/rb/ruby/IceBox.rb
+++ b/rb/ruby/IceBox.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/ruby/IceGrid.rb b/rb/ruby/IceGrid.rb
index 7ca2ef3233b..8486fb35517 100644
--- a/rb/ruby/IceGrid.rb
+++ b/rb/ruby/IceGrid.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/ruby/IcePatch2.rb b/rb/ruby/IcePatch2.rb
index abc5a2d5240..32abcfc11f8 100644
--- a/rb/ruby/IcePatch2.rb
+++ b/rb/ruby/IcePatch2.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/ruby/IceStorm.rb b/rb/ruby/IceStorm.rb
index aa7db221ac4..be655f82c8b 100644
--- a/rb/ruby/IceStorm.rb
+++ b/rb/ruby/IceStorm.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/test/Ice/application/Client.rb b/rb/test/Ice/application/Client.rb
index cd94d487546..cd94d487546 100644..100755
--- a/rb/test/Ice/application/Client.rb
+++ b/rb/test/Ice/application/Client.rb
diff --git a/rb/test/Ice/binding/AllTests.rb b/rb/test/Ice/binding/AllTests.rb
index ba219eb9840..6a4cc9fcc5f 100644
--- a/rb/test/Ice/binding/AllTests.rb
+++ b/rb/test/Ice/binding/AllTests.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/test/Ice/binding/Client.rb b/rb/test/Ice/binding/Client.rb
index 80ff9bd4941..80ff9bd4941 100644..100755
--- a/rb/test/Ice/binding/Client.rb
+++ b/rb/test/Ice/binding/Client.rb
diff --git a/rb/test/Ice/checksum/AllTests.rb b/rb/test/Ice/checksum/AllTests.rb
index 4caff2a3a56..ec7909572f0 100644
--- a/rb/test/Ice/checksum/AllTests.rb
+++ b/rb/test/Ice/checksum/AllTests.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/test/Ice/checksum/Client.rb b/rb/test/Ice/checksum/Client.rb
index 7d2b38dc481..7d2b38dc481 100644..100755
--- a/rb/test/Ice/checksum/Client.rb
+++ b/rb/test/Ice/checksum/Client.rb
diff --git a/rb/test/Ice/exceptions/AllTests.rb b/rb/test/Ice/exceptions/AllTests.rb
index 276b0c289f2..d2475545066 100644
--- a/rb/test/Ice/exceptions/AllTests.rb
+++ b/rb/test/Ice/exceptions/AllTests.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/test/Ice/exceptions/Client.rb b/rb/test/Ice/exceptions/Client.rb
index ca8ceade740..ca8ceade740 100644..100755
--- a/rb/test/Ice/exceptions/Client.rb
+++ b/rb/test/Ice/exceptions/Client.rb
diff --git a/rb/test/Ice/facets/AllTests.rb b/rb/test/Ice/facets/AllTests.rb
index 402952ac41e..637a489c375 100644
--- a/rb/test/Ice/facets/AllTests.rb
+++ b/rb/test/Ice/facets/AllTests.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/test/Ice/facets/Client.rb b/rb/test/Ice/facets/Client.rb
index 4fa05b709b2..4fa05b709b2 100644..100755
--- a/rb/test/Ice/facets/Client.rb
+++ b/rb/test/Ice/facets/Client.rb
diff --git a/rb/test/Ice/inheritance/AllTests.rb b/rb/test/Ice/inheritance/AllTests.rb
index 459d1b0297f..b7e02b5d46c 100644
--- a/rb/test/Ice/inheritance/AllTests.rb
+++ b/rb/test/Ice/inheritance/AllTests.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/test/Ice/inheritance/Client.rb b/rb/test/Ice/inheritance/Client.rb
index 2d6405e0583..2d6405e0583 100644..100755
--- a/rb/test/Ice/inheritance/Client.rb
+++ b/rb/test/Ice/inheritance/Client.rb
diff --git a/rb/test/Ice/location/AllTests.rb b/rb/test/Ice/location/AllTests.rb
index 99512b603c1..0b1718e3e82 100644
--- a/rb/test/Ice/location/AllTests.rb
+++ b/rb/test/Ice/location/AllTests.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/test/Ice/location/Client.rb b/rb/test/Ice/location/Client.rb
index 8875ddd4ff8..8875ddd4ff8 100644..100755
--- a/rb/test/Ice/location/Client.rb
+++ b/rb/test/Ice/location/Client.rb
diff --git a/rb/test/Ice/objects/AllTests.rb b/rb/test/Ice/objects/AllTests.rb
index 461e3b991b3..eba3d775395 100644
--- a/rb/test/Ice/objects/AllTests.rb
+++ b/rb/test/Ice/objects/AllTests.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/test/Ice/objects/Client.rb b/rb/test/Ice/objects/Client.rb
index 78414aab62d..78414aab62d 100644..100755
--- a/rb/test/Ice/objects/Client.rb
+++ b/rb/test/Ice/objects/Client.rb
diff --git a/rb/test/Ice/objects/TestI.rb b/rb/test/Ice/objects/TestI.rb
index 11b928c6907..9cdca43b7bb 100644
--- a/rb/test/Ice/objects/TestI.rb
+++ b/rb/test/Ice/objects/TestI.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/test/Ice/operations/AllTests.rb b/rb/test/Ice/operations/AllTests.rb
index 30830252081..86de1b76a27 100644
--- a/rb/test/Ice/operations/AllTests.rb
+++ b/rb/test/Ice/operations/AllTests.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/test/Ice/operations/BatchOneways.rb b/rb/test/Ice/operations/BatchOneways.rb
index 565ad8089b9..0e6a4b1b824 100644
--- a/rb/test/Ice/operations/BatchOneways.rb
+++ b/rb/test/Ice/operations/BatchOneways.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/test/Ice/operations/Client.rb b/rb/test/Ice/operations/Client.rb
index d66074a8939..d66074a8939 100644..100755
--- a/rb/test/Ice/operations/Client.rb
+++ b/rb/test/Ice/operations/Client.rb
diff --git a/rb/test/Ice/operations/Twoways.rb b/rb/test/Ice/operations/Twoways.rb
index c7714301ad8..b441a3b66ad 100644
--- a/rb/test/Ice/operations/Twoways.rb
+++ b/rb/test/Ice/operations/Twoways.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
@@ -540,7 +539,4 @@ def twoways(communicator, p)
 
         ic.destroy()
     end
-
-
-    
 end
diff --git a/rb/test/Ice/proxy/AllTests.rb b/rb/test/Ice/proxy/AllTests.rb
index c392dc12973..43b4368590a 100644
--- a/rb/test/Ice/proxy/AllTests.rb
+++ b/rb/test/Ice/proxy/AllTests.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/test/Ice/proxy/Client.rb b/rb/test/Ice/proxy/Client.rb
index 32e5c8ff367..32e5c8ff367 100644..100755
--- a/rb/test/Ice/proxy/Client.rb
+++ b/rb/test/Ice/proxy/Client.rb
diff --git a/rb/test/Ice/retry/AllTests.rb b/rb/test/Ice/retry/AllTests.rb
index dcbfaa0438c..50aba0da777 100644
--- a/rb/test/Ice/retry/AllTests.rb
+++ b/rb/test/Ice/retry/AllTests.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/test/Ice/retry/Client.rb b/rb/test/Ice/retry/Client.rb
index b8975f6e8be..b8975f6e8be 100644..100755
--- a/rb/test/Ice/retry/Client.rb
+++ b/rb/test/Ice/retry/Client.rb
diff --git a/rb/test/Ice/slicing/exceptions/AllTests.rb b/rb/test/Ice/slicing/exceptions/AllTests.rb
index 5fd50c987a9..3fc9e78e7ab 100644
--- a/rb/test/Ice/slicing/exceptions/AllTests.rb
+++ b/rb/test/Ice/slicing/exceptions/AllTests.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/test/Ice/slicing/exceptions/Client.rb b/rb/test/Ice/slicing/exceptions/Client.rb
index 05c3b2f8d63..05c3b2f8d63 100644..100755
--- a/rb/test/Ice/slicing/exceptions/Client.rb
+++ b/rb/test/Ice/slicing/exceptions/Client.rb
diff --git a/rb/test/Ice/slicing/objects/AllTests.rb b/rb/test/Ice/slicing/objects/AllTests.rb
index 3dc9140b6e4..cfa57ca8d0b 100644
--- a/rb/test/Ice/slicing/objects/AllTests.rb
+++ b/rb/test/Ice/slicing/objects/AllTests.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/test/Ice/slicing/objects/Client.rb b/rb/test/Ice/slicing/objects/Client.rb
index 9e3015d5121..9e3015d5121 100644..100755
--- a/rb/test/Ice/slicing/objects/Client.rb
+++ b/rb/test/Ice/slicing/objects/Client.rb
diff --git a/rb/test/Ice/timeout/AllTests.rb b/rb/test/Ice/timeout/AllTests.rb
index 872a7f021d4..de65352d88c 100644
--- a/rb/test/Ice/timeout/AllTests.rb
+++ b/rb/test/Ice/timeout/AllTests.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
diff --git a/rb/test/Ice/timeout/Client.rb b/rb/test/Ice/timeout/Client.rb
index 2bf27ff9d4e..2bf27ff9d4e 100644..100755
--- a/rb/test/Ice/timeout/Client.rb
+++ b/rb/test/Ice/timeout/Client.rb
diff --git a/rb/test/Slice/keyword/Client.rb b/rb/test/Slice/keyword/Client.rb
index 268bf653784..268bf653784 100644..100755
--- a/rb/test/Slice/keyword/Client.rb
+++ b/rb/test/Slice/keyword/Client.rb