Merge 'trunk' into 'DBIx-Class-current'

diff --cc Changes
index c7f671f,21968ef..bf29764
--- 1/Changes
--- 2/Changes
+++ b/Changes
@@@ -1,22 -1,8 +1,24 @@@
  Revision history for DBIx::Class
  
 +        - modified SQLT parser to skip dupe table names
 +        - added remove_column(s) to ResultSource/ResultSourceProxy
 +        - added add_column alias to ResultSourceProxy
 +        - added source_name to ResultSource
 +        - load_classes now uses source_name and sets it if necessary
 +        - add update_or_create_related to Relationship::Base
 +        - add find_or_new to ResultSet/ResultSetProxy and find_or_new_related
 +          to Relationship::Base
 +        - add accessors for unique constraint names and coulums to
 +          ResultSource/ResultSourceProxy
 +        - rework ResultSet::find() to search unique constraints
 +        - CDBICompat: modify retrieve to fix column casing when ColumnCase is
 +          loaded
 +        - CDBICompat: override find_or_create to fix column casing when
 +          ColumnCase is loaded
 +
  0.06003
+         - fix for has_many prefetch with 0 related rows
+         - make limit error if rows => 0
          - added memory cycle tests and a long-needed weaken call
  
  0.06002 2006-04-20 00:42:41

diff --cc lib/DBIx/Class/ResultSet.pm
Simple merge

diff --cc lib/DBIx/Class/Storage/DBI.pm
Simple merge