--- a/base/src/java/lang/util.d	Wed Mar 16 21:53:53 2011 +0900
+++ b/base/src/java/lang/util.d	Wed Apr 06 21:57:23 2011 +0200
@@ -216,8 +216,22 @@
 int arrayIndexOf(T)( T[] arr, T v ){
     int res = -1;
     int idx = 0;
-    foreach( p; arr ){
-        if( p == v){
+       
+    
+    static if (is(T == interface))
+    {
+        Object[] array = cast(Object[]) arr;
+        Object value = cast(Object) v;
+    }
+        
+    else
+    {
+        auto array = arr;
+        auto value = v;
+    }
+    
+    foreach( p; array ){
+        if( p == value){
             res = idx;
             break;
         }
@@ -253,4 +267,11 @@
     const ImportData getImportData = ImportData( cast(void[]) import(name), name );
 }
 
-
+template gshared (String content)
+{
+    version (D_Version2)
+        const gshared = "__gshared: " ~ content;
+        
+    else
+        const gshared = content;
+}