Merge 'resultset-new-refactor' into 'DBIx-Class-current'

diff --cc lib/DBIx/Class/ResultSet.pm
index 8fc894d,4a164d4..e94782f
--- 1/lib/DBIx/Class/ResultSet.pm
--- 2/lib/DBIx/Class/ResultSet.pm
+++ b/lib/DBIx/Class/ResultSet.pm
@@@ -367,7 -328,7 +328,8 @@@ sub find 
  
      # Add the ResultSet's alias
      foreach my $key (grep { ! m/\./ } keys %$unique_query) {
--      $unique_query->{"$self->{attrs}{alias}.$key"} = delete $unique_query->{$key};
++      my $alias = $self->{attrs}->{alias};
++      $unique_query->{"$alias.$key"} = delete $unique_query->{$key};
      }
  
      push @unique_queries, $unique_query if %$unique_query;