Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git

htroot/env/base.css

@@ -960,7 +960,7 @@ div#api {
   position:absolute;
   top:60px;
   right:20px;
-  z-index: 100;
+  z-index: 1600;
 }
 
 div#api span {
@@ -1048,4 +1048,4 @@ div#info:hover span {
   text-align: left;
   border: 1px dashed black;
   z-index: 100;
- }
+ }

source/net/yacy/cora/federate/solr/instance/RemoteInstance.java

@@ -256,6 +256,6 @@ public class RemoteInstance implements SolrInstance {
     }
 
     public static int queueSizeByMemory() {
-        return (int) Math.max(1, MemoryControl.maxMemory() / 1024 / 1024 / 12);
+        return (int) Math.min(500, Math.max(1, MemoryControl.maxMemory() / 1024 / 1024 / 12));
     }
 }