Merge branch 'custom_column_info'
Rafael Kitover [Sat, 20 Feb 2010 01:39:00 +0000 (20:39 -0500)]

Trivial merge