[numpy/f20: 2/2] Merge branch 'master' into f20

[Orion Poplawski]

commit d3472b22ffc04a383f2f91f83c4a9d0c52d7f3a3
Merge: 3fe06b8 1b6fbc1
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Nov 27 22:11:33 2013 -0700

    Merge branch 'master' into f20

 numpy.spec |   34 ++++++++--------------------------
 1 files changed, 8 insertions(+), 26 deletions(-)
---