Marketing on Demand versus Marketing Automation

I've been hearing these two terms thrown around quite a bit lately. Is MoD an end user facing term and MA a producer, back-end administrative term? Does MA help the end user or the producer? Is MA a sub-category of MoD? I'm sure their related...but how? I'd appreciate your thoughts...