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

r9906@haferschleim (orig r1105):  jguenther | 2006-03-16 10:26:06 +0100
fixed e-mail address

diff --cc lib/DBIx/Class.pm
index 444dc59,2228a86..144a495
--- 1/lib/DBIx/Class.pm
--- 2/lib/DBIx/Class.pm
+++ b/lib/DBIx/Class.pm
@@@ -172,14 -164,8 +172,12 @@@ Scotty Allen <scotty@scottyallen.com
  
  sc_
  
- Robert Sedlacek <phaylon@dunkelheit.at>
- 
- Justin Guenther <jguenther@agr.gc.ca>
+ Justin Guenther <guentherj@agr.gc.ca>
  
 +Daisuke Murase <typester@cpan.org>
 +
 +Scott McWhirter (konobi)
 +
  =head1 LICENSE
  
  You may distribute this code under the same terms as Perl itself.