Merge 'chaining_fixes' into 'trunk'
Peter Rabbitson [Thu, 11 Feb 2010 18:33:03 +0000 (19:33 +0100)]
r8639@Thesaurus (orig r8626):  ribasushi | 2010-02-11 12:33:03 +0100
Changes and small ommission


Trivial merge