Comedaction

(n.) A genre that is the combination of both Comedy and Action. The action itself may be simultaneously comedic, or the comedy and action may be presented in tandem.

"Hot Fuzz" was more of a comedaction than "Shaun of the Dead", but not by much. "Team America", on the other hand, may be classified as a comedaction, but I personally believe it's more of a comedy, despite the action sequences.