Merge 'trunk' into 'on_connect_call'
Tim Bunce [Fri, 12 Jun 2009 12:27:38 +0000 (05:27 -0700)]
r5497@hlagh (orig r6647):  timbunce | 2009-06-12 07:27:38 -0700
Added reference to get_inflated_columns in get_columns docs.


Trivial merge