Merge branch 'master' of git://github.com/jrockway/catalyst-component-accept_context
Tomas Doran (t0m) [Thu, 11 Jun 2009 09:21:45 +0000 (10:21 +0100)]

Trivial merge