Merged r1773:1791 branch of numpy into main trunk

1 files changed, 14 insertions, 0 deletions

diff --git a/numpy/lib/mlab.py b/numpy/lib/mlab.py
new file mode 100644
index 000000000..f082cdc0d
--- /dev/null
+++ b/numpy/lib/mlab.py
@@ -0,0 +1,14 @@
+# This module is for compatibility only.  All functions are defined elsewhere.
+
+from numpy.core.numeric import *
+
+from twodim_base import eye, tri, diag, fliplr, flipud, rot90, tril, triu
+from numpy.core.oldnumeric import amax as max
+from numpy.core.oldnumeric import amin as min
+from function_base import msort, median, trapz, diff, cov, corrcoef, kaiser, blackman, \
+     bartlett, hanning, hamming, sinc, angle
+from numpy.core.oldnumeric import cumsum, ptp, mean, std, prod, cumprod, squeeze
+from polynomial import roots
+
+from numpy.random import rand, randn
+from numpy.corelinalg import eig, svd