Merge branch 'chained_fix' into 5.80032_dev
Tomas Doran [Tue, 22 Feb 2011 22:09:40 +0000 (22:09 +0000)]
* chained_fix:
  Apply more correct fix than 8df53b (I hope)
  Rename test
  Make tests more clear
  Merge revert 8df53bed
  Un-TODO abraxxa's tests


Trivial merge