Merge 'trunk' into 'chaining_fixes'
Peter Rabbitson [Fri, 22 Jan 2010 17:35:15 +0000 (18:35 +0100)]
r8426@Thesaurus (orig r8413):  ribasushi | 2010-01-22 11:35:15 +0100
Moev failing regression test away from trunk


Trivial merge