Merge 'trunk' into 'better_scripts'
Tomas Doran [Sun, 29 Nov 2009 15:39:41 +0000 (15:39 +0000)]
r13191@nc10 (orig r12060):  gshank | 2009-11-27 22:43:11 +0000
testcase for Chained bug - dispatches to wrong action


Trivial merge