Merge remote-tracking branch 'jaberg/mrg_dont_make_so_many_streams' into ipam2012

theano/sandbox/rng_mrg.py

@@ -618,7 +618,7 @@ def guess_n_streams(size, warn=True):
             r *= s
         if r > 6:
             r = r/6 # chosen as fastest for rbm_benchmark
-        return r
+        return min(r, 30 * 256)
     else:
         if warn:
             warnings.warn((