mrg-fix-trunk-after-mrg

1591f61e · Merge branch 'neurospin-master' · Jul 19, 2010

nipy trunk at / after failed merge from neurospin