Merge 'column_info_from_storage' into 'DBIx-Class-current'

diff --cc lib/DBIx/Class/ResultSource.pm
index 864f8f0,2cf6a97..2b81444
--- 1/lib/DBIx/Class/ResultSource.pm
--- 2/lib/DBIx/Class/ResultSource.pm
+++ b/lib/DBIx/Class/ResultSource.pm
@@@ -12,10 -12,10 +12,10 @@@ __PACKAGE__->load_components(qw/Accesso
  
  __PACKAGE__->mk_group_accessors('simple' => qw/_ordered_columns
    _columns _primaries _unique_constraints name resultset_attributes
-   schema from _relationships source_name/);
 -  schema from _relationships column_info_from_storage/);
++  schema from _relationships column_info_from_storage source_name/);
  
  __PACKAGE__->mk_group_accessors('component_class' => qw/resultset_class
 -  result_class source_name/);
 +  result_class/);
  
  =head1 NAME