another "temporary" hack

I heard of some package merging problems, testlib declares std.test package,
and stdlib.jar has std package

testlib/test/CollectionTest.kt

@@ -5,7 +5,7 @@ package test.collections
 import std.*
 import std.io.*
 import std.util.*
-import std.test.*
+import stdhack.test.*
 import java.util.*
 
 class CollectionTest() : TestSupport() {

testlib/test/IoTest.kt

@@ -1,6 +1,6 @@
 package test.collections
 
-import std.test.*
+import stdhack.test.*
 
 import std.io.*
 import std.util.*

testlib/test/ListTest.kt

@@ -1,6 +1,6 @@
 package test.collections
 
-import std.test.*
+import stdhack.test.*
 
 // TODO can we avoid importing all this stuff by default I wonder?
 // e.g. making println and the collection builder methods public by default?

testlib/test/MapTest.kt

@@ -1,6 +1,6 @@
 package test.collections
 
-import std.test.*
+import stdhack.test.*
 
 // TODO can we avoid importing all this stuff by default I wonder?
 // e.g. making println and the collection builder methods public by default?

testlib/test/OldStdlibTest.kt

@@ -3,7 +3,7 @@ package test.collections
 import std.*
 import std.io.*
 import std.util.*
-import std.test.*
+import stdhack.test.*
 import java.util.*
 import java.io.*
 

testlib/test/SetTest.kt

@@ -3,7 +3,7 @@ package test.collections
 import std.*
 import std.io.*
 import std.util.*
-import std.test.*
+import stdhack.test.*
 import java.util.*
 
 class SetTest() : TestSupport() {

testlib/test/StandardCollectionTest.kt

@@ -1,7 +1,7 @@
 package test.collections
 
 import std.*
-import std.test.*
+import stdhack.test.*
 
 class StandardCollectionTest() : TestSupport() {
 

testlib/test/Test.kt

@@ -1,4 +1,4 @@
-package std.test
+package stdhack.test
 
 import std.io.*
 import std.util.*

testlib/test/TestDslExample.kt

@@ -1,7 +1,7 @@
 package testDslExample
 
 import std.io.*
-import std.test.*
+import stdhack.test.*
 
 import junit.framework.*
 import junit.textui.TestRunner