applied tim leslie's patch (i think -- not good with patch)
applied tim leslie's patch (i think -- not good with patch)

bthirion/nipy,alexis-roche/nipy,arokem/nipy,alexis-roche/nireg,alexis-roche/nireg,bthirion/nipy,nipy/nireg,arokem/nipy,nipy/nipy-labs,alexis-roche/niseg,arokem/nipy,alexis-roche/register,bthirion/nipy,alexis-roche/register,bthirion/nipy,nipy/nireg,alexis-roche/nipy,alexis-roche/nipy,alexis-roche/niseg,nipy/nipy-labs,arokem/nipy,alexis-roche/nipy,alexis-roche/register