mrg-fix-trunk-tip

matthew.brett@gmail.com

bfa538d7 · DOC - spellings + adding THANKS to myself ;) · Jul 29, 2010

nipy trunk after bad merge and subsequent commits