Merge 'trunk' into 'rt58057'

r15672@spaceinvaders (orig r13363):  jester | 2010-06-22 21:47:45 +0100
Fixed typo

r15674@spaceinvaders (orig r13365):  bricas | 2010-06-24 13:52:20 +0100
add typo fix to Changes
r15689@spaceinvaders (orig r13380):  arcanez | 2010-07-03 01:04:07 +0100
remove extra '
r15716@spaceinvaders (orig r13407):  hobbs | 2010-07-09 10:40:44 +0100
Try harder to make finalize_error encoding-safe.

r15750@spaceinvaders (orig r13441):  t0m | 2010-07-28 22:39:41 +0100
 r15666@spaceinvaders (orig r13357):  jnapiorkowski | 2010-06-16 20:12:46 +0100
 new branch
 r15667@spaceinvaders (orig r13358):  jnapiorkowski | 2010-06-16 20:55:08 +0100
 broke out and documented action_class method
 r15749@spaceinvaders (orig r13440):  t0m | 2010-07-28 22:39:32 +0100
 Changelog

diff --cc lib/Catalyst/Controller.pm
Simple merge

diff --cc lib/Catalyst/Engine.pm
Simple merge