BUG: Concatenate with axis None should work regardless of matching array shapes
TST: Add test for concatenate with None-axis

Conflicts:
	numpy/core/tests/test_shape_base.py
Merge pull request #3275 from dieterv77/fix-concat-1.7.x

Backport fix for np.concatenate with axis=None
Fix for astype('S') string truncate issue

Calling astype('S') for an array of string objects results in a string array where dtype='S64', even if the original string objects are longer than 64 characters. Add call to GetParamsFromObject() to determine maximum string object length, and use that as string dtype size.
Add support for unicode strings
Add tests for strings shorter than 64 characters
MAINT: Fix tests for 2to3 and Python < 2.6.

Use asbytes instead of 'b' and the 'u' string prefix instead of sixu.
Merge pull request #3277 from charris/backport-3270

Backport 3270
BUG: fix potentially infinite recursion in VOID_nonzero. Fixes #3312.
TST: add a test for issue #3312
Merge pull request #3317 from ecatmur/maintenance/1.7.x

Backport #3313 to maintenance/1.7.x
BUG: include mtrand cython files in sdist

the files are required to do a full source rebuild.
BUG: Handle a version string from a custom-built mingw64.

The custom build compiler "GNU Fortran (rubenvb-4.8.0) 4.8.0" was
incorrectly parsed as version '-4.8.0' and the flag "-mno-cygwin" was
added to the compilation.

See http://cens.ioc.ee/pipermail/f2py-users/2010-October/002092.html.
BUG: The npv function in financial.py was incorrectly implemented.

Correct the implementation of the npv function, its documentation, and
the mirr function that depends on it. The test_financial.py is also
corrected to take into account those modifications

The npv function behavior was contrary to what the documentation stated
as it summed indexes 1 to M instead of 0 to M-1. The mirr function used
a corrective factor to get the correct result in spite of that error so
that factor is removed.

Closes #649