Merge 'trunk' into 'get_inflated_columns_rt46953'
Peter Rabbitson [Thu, 26 Nov 2009 21:32:17 +0000 (22:32 +0100)]
r7972@Thesaurus (orig r7960):  ribasushi | 2009-11-26 15:32:17 +0100
Whoops, wrong accessor (things still work though)


Trivial merge