Thought I fixed this already
Merge branch 'master' of git://github.com/jaykickliter/Multirate.jl

Conflicts:
	src/FIRDesign.jl