[pypy-commit] pypy numpypy-problems: fix merge

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: numpypy-problems
Changeset: r58113:aab748525531
Date: 2012-10-14 23:18 +0200
http://bitbucket.org/pypy/pypy/changeset/aab748525531/

Log:	fix merge

diff --git a/pypy/module/micronumpy/interp_dtype.py b/pypy/module/micronumpy/interp_dtype.py
--- a/pypy/module/micronumpy/interp_dtype.py
+++ b/pypy/module/micronumpy/interp_dtype.py
@@ -498,6 +498,7 @@
             self.w_int64dtype, self.w_uint64dtype,
             self.w_float32dtype, self.w_float64dtype, self.w_complex64dtype,
             self.w_complex128dtype,
+            self.w_stringdtype, self.w_unicodedtype,
             self.w_voiddtype, self.w_intpdtype, self.w_uintpdtype,
         ]
         self.float_dtypes_by_num_bytes = sorted(