Merge branch 'master' of http://github.com/nipy/nipype

Author: Shoshana Berleant

nipype/interfaces/fsl/__init__.py

@@ -8,8 +8,8 @@
 """
 
 from .base import (FSLCommand, Info, check_fsl, no_fsl, no_fsl_course_data)
-from .preprocess import (FAST, FLIRT, ApplyXfm, BET, MCFLIRT, FNIRT, ApplyWarp,
-                         SliceTimer, SUSAN, PRELUDE, FUGUE, FIRST)
+from .preprocess import (FAST, FLIRT, ApplyXfm, ApplyXFM, BET, MCFLIRT, FNIRT,
+                         ApplyWarp, SliceTimer, SUSAN, PRELUDE, FUGUE, FIRST)
 from .model import (Level1Design, FEAT, FEATModel, FILMGLS, FEATRegister,
                     FLAMEO, ContrastMgr, MultipleRegressDesign, L2Model, SMM,
                     MELODIC, SmoothEstimate, Cluster, Randomise, GLM)