Merge branch 'master' of git://github.com/chrisa/catalyst-engine-stomp
t0m [Mon, 13 Jul 2009 20:49:36 +0000 (21:49 +0100)]

Trivial merge