Merge branch 'psgi' of git.shadowcat.co.uk:Catalyst-Runtime into psgi
John Napiorkowski [Wed, 27 Jul 2011 15:06:30 +0000 (11:06 -0400)]

Trivial merge