Original commit message from CVS: state change fixes from Pedro Corte-Real for shout and shout2 plugins