Merge branch 'R3_3_branch' of cvs:/home/git/ice into R3_3_branch

Conflicts:

	java/resources/IceGridAdmin/icegridadmin_content_dyn.html
	java/resources/IceGridAdmin/icegridadmin_content_static.html

6 files changed, 9 insertions, 9 deletions

diff --git a/demoscript/Freeze/__init__.py b/demoscript/Freeze/__init__.py
index 1f65e2040ac..4ed7c4586c0 100755
--- a/demoscript/Freeze/__init__.py
+++ b/demoscript/Freeze/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
diff --git a/demoscript/Freeze/bench.py b/demoscript/Freeze/bench.py
index 8f2606b9a9f..7aa64434bad 100755
--- a/demoscript/Freeze/bench.py
+++ b/demoscript/Freeze/bench.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
diff --git a/demoscript/Freeze/casino.py b/demoscript/Freeze/casino.py
index 64788a7f27f..a44a3cb9807 100755
--- a/demoscript/Freeze/casino.py
+++ b/demoscript/Freeze/casino.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
diff --git a/demoscript/Freeze/library.py b/demoscript/Freeze/library.py
index 578b990a38b..3b3c8ad3a5a 100755
--- a/demoscript/Freeze/library.py
+++ b/demoscript/Freeze/library.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 import sys
-import demoscript.Expect as Expect
+from scripts import Expect
 
 def dequote(s):
     cur = 0
diff --git a/demoscript/Freeze/phonebook.py b/demoscript/Freeze/phonebook.py
index aa8927adabd..e4ea041bcb4 100755
--- a/demoscript/Freeze/phonebook.py
+++ b/demoscript/Freeze/phonebook.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 import sys
-import demoscript.Expect as Expect
+from scripts import Expect
 
 def dequote(s):
     cur = 0
diff --git a/demoscript/Freeze/transform.py b/demoscript/Freeze/transform.py
index 5bd8568dd0a..e37fd57b0c9 100755
--- a/demoscript/Freeze/transform.py
+++ b/demoscript/Freeze/transform.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 import sys, demoscript, time
-import demoscript.Expect as Expect
+from scripts import Expect
 
 def run(createCmd, recreateCmd, readCmd, readnewCmd):
     print "cleaning databases...",